Add OpenSimplex

jonathonracz · Jan 8, 2018 · 27ffb80 · 27ffb80
1 parent c3affd6
commit 27ffb80
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "jtracer/External/OpenSimplexCPP"]
+	path = jtracer/External/OpenSimplexCPP
+	url = https://jonathonracz@github.com/jonathonracz/OpenSimplexCPP.git
diff --git a/jtracer.xcodeproj/project.pbxproj b/jtracer.xcodeproj/project.pbxproj
@@ -335,6 +335,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = YES;
+				MTL_HEADER_SEARCH_PATHS = "${PROJECT_DIR}/jtracer/External/OpenSimplexCPP/include";
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 			};
@@ -384,6 +385,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_HEADER_SEARCH_PATHS = "${PROJECT_DIR}/jtracer/External/OpenSimplexCPP/include";
 				SDKROOT = macosx;
 			};
 			name = Release;

diff --git a/jtracer/External/OpenSimplexCPP b/jtracer/External/OpenSimplexCPP
diff --git a/jtracer/JTMetal.metal b/jtracer/JTMetal.metal
@@ -13,6 +13,8 @@ using namespace metal;
 #include "Trace/JTBindPoints.h"
 #include "Trace/JTNumerics.h"
 
+#include "OpenSimplex/OpenSimplex.h"
+
 kernel void jtMetal(texture2d<half, access::write> output [[texture(jt::TextureIndex::output)]],
                     JT_CONSTANT jt::Uniforms& uniforms [[buffer(jt::BufferIndex::uniforms)]],
                     simd::uint2 gid [[thread_position_in_grid]])
@@ -23,5 +25,8 @@ kernel void jtMetal(texture2d<half, access::write> output [[texture(jt::TextureI
     if((gid.x >= output.get_width()) || (gid.y >= output.get_height()))
         return;
 
-    output.write(half4(random.nextNormalized(), gid.y / static_cast<float>(output.get_height()), 0.0f, 1.0f), gid);
+    //OpenSimplex osimp(uniforms.frameCount);
+    //float pixelValue = osimp.noise2(gid.x, gid.y);
+
+    output.write(half4(1.0f, 0.0f, 0.0f, 1.0f), gid);
 }