fixed wormhole and maze generator culling

CLOUDS-Interactive-Documentary · Jun 30, 2014 · e7074da · e7074da
1 parent 06c1d97
commit e7074da
Show file tree

Hide file tree

Showing 10 changed files with 770 additions and 7 deletions.
diff --git a/CloudsData/visualsystems/WormHole/Presets/blueTunnel/Timeline/CameraPath_pathPosition.xml b/CloudsData/visualsystems/WormHole/Presets/blueTunnel/Timeline/CameraPath_pathPosition.xml
@@ -3,12 +3,12 @@
         <easefunc>0</easefunc>
         <easetype>2</easetype>
         <time>00:00:00:463</time>
-        <value>0</value>
+        <value>0.000000000</value>
     </key>
     <key>
         <easefunc>0</easefunc>
         <easetype>0</easetype>
         <time>00:00:10:085</time>
-        <value>1</value>
+        <value>1.000000000</value>
     </key>
 </keyframes>
diff --git a/CloudsData/visualsystems/WormHole/Presets/blueTunnel/Timeline/IntroOutro.xml b/CloudsData/visualsystems/WormHole/Presets/blueTunnel/Timeline/IntroOutro.xml
@@ -2,6 +2,6 @@
     <key>
         <flag />
         <time>00:00:27:582</time>
-        <value>0.975</value>
+        <value>0.975000024</value>
     </key>
 </keyframes>
diff --git a/CloudsLibrary/src/VisualSystems/MazeGenerator/vs_src/Maze.cpp b/CloudsLibrary/src/VisualSystems/MazeGenerator/vs_src/Maze.cpp
@@ -136,7 +136,11 @@ void Maze::draw(ofCamera *cam, ofVec3f &lightPos)
     // draw maze geometry
     ofSetColor(settings->getWallColor());
 	glEnable(GL_CULL_FACE);
+#ifdef OCULUS_RIFT
 	glCullFace(GL_BACK);
+#else
+	glCullFace(GL_FRONT);
+#endif
 	geometry.draw(GL_TRIANGLES, vertexIndexForLines[camCellY], vertexIndexForLines[lastVisibleLine]-vertexIndexForLines[camCellY]);
 	glDisable(GL_CULL_FACE);
 

diff --git a/CloudsLibrary/src/VisualSystems/WormHole/vs_src/CloudsVisualSystemWormHole.cpp b/CloudsLibrary/src/VisualSystems/WormHole/vs_src/CloudsVisualSystemWormHole.cpp
@@ -544,7 +544,11 @@ void CloudsVisualSystemWormHole::selfDraw()
 	//cull
 	if (bCullBackface){
 		glEnable(GL_CULL_FACE);
+#ifdef OCULUS_RIFT
 		glCullFace(GL_BACK);
+#else
+		glCullFace(GL_FRONT);
+#endif
     }
 
 	//depth testing

diff --git a/VSMazeGenerator/VSMazeGenerator.sln b/VSMazeGenerator/VSMazeGenerator.sln
@@ -0,0 +1,55 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxUILib", "..\..\..\addons\ofxUI\ofxUILib\ofxUILib.vcxproj", "{641DB976-E775-4D72-86EB-897E2C4A0EEE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxTimelineLib", "..\..\..\addons\ofxTimeline\ofxTimelineLib\ofxTimelineLib.vcxproj", "{A72C4F16-CB16-4143-BA5C-5E4FA802D636}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VSMazeGenerator", "VSMazeGenerator.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|Win32.Build.0 = Debug|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|x64.ActiveCfg = Debug|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|x64.Build.0 = Debug|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|Win32.ActiveCfg = Release|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|Win32.Build.0 = Release|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|x64.ActiveCfg = Release|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|x64.Build.0 = Release|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|Win32.Build.0 = Debug|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|x64.ActiveCfg = Debug|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|x64.Build.0 = Debug|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|Win32.ActiveCfg = Release|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|Win32.Build.0 = Release|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|x64.ActiveCfg = Release|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|x64.Build.0 = Release|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal