fixed rgbd video

CLOUDS-Interactive-Documentary · Apr 9, 2016 · 77a1e0a · 77a1e0a
1 parent 797077f
commit 77a1e0a
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 48 deletions.
diff --git a/CloudsData/visualsystems/RGBDVideo/shaders/rgbd_simple_mesh.frag b/CloudsData/visualsystems/RGBDVideo/shaders/rgbd_simple_mesh.frag
@@ -1,10 +1,12 @@
-#version 110
+#version 120
 #extension GL_ARB_texture_rectangle : enable
 
+uniform sampler2DRect texture;
+
 varying float positionValid;
 const float epsilon = 1e-6;
 uniform float colorFade;
-uniform sampler2DRect texture;
+
 varying vec2 texSample;
 
 void main(){
@@ -15,9 +17,9 @@ void main(){
 
     vec4 col = texture2DRect(texture, texSample);
 
-//  gl_FragColor.rgb = mix(col,gl_Color,colorFade).rgb;
-//	gl_FragColor.a = 1.0;
 
     gl_FragColor = col * gl_Color;
+
+
 }
 
diff --git a/CloudsData/visualsystems/RGBDVideo/shaders/rgbd_simple_mesh.vert b/CloudsData/visualsystems/RGBDVideo/shaders/rgbd_simple_mesh.vert
@@ -78,7 +78,6 @@ float depthValueFromSample( vec2 depthPos){
 void main(void){
 
 	// Here we get the position, and account for the vertex position flowing
-//	vec2 samplePos = vec2(gl_Vertex.x + offset, gl_Vertex.y + 480. * scale);
 
     float depth = depthValueFromSample( gl_Vertex.xy );
 
@@ -124,5 +123,6 @@ void main(void){
 	pos.xyz += pointoffset;
 
     gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * pos;
+
     gl_FrontColor = gl_Color;
 }
diff --git a/CloudsLibrary/src/VisualSystems/RGBDVideo/vs_src/CloudsVisualSystemRGBDVideo.cpp b/CloudsLibrary/src/VisualSystems/RGBDVideo/vs_src/CloudsVisualSystemRGBDVideo.cpp
@@ -476,6 +476,9 @@ void CloudsVisualSystemRGBDVideo::selfDraw(){
 }
 
 void CloudsVisualSystemRGBDVideo::setupGeneralUniforms(ofShader& shader){
+
+	player.bind();
+
     shader.setUniformTexture("texture", player.getTextureReference(), 1);
     shader.setUniform2f("depthPP", videoIntrinsics.depthPP.x,videoIntrinsics.depthPP.y );
     shader.setUniform2f("depthFOV", videoIntrinsics.depthFOV.x,videoIntrinsics.depthFOV.y );
@@ -491,7 +494,7 @@ void CloudsVisualSystemRGBDVideo::setupGeneralUniforms(ofShader& shader){
 
 void CloudsVisualSystemRGBDVideo::drawOcclusionLayer(){
 
-    glPushMatrix();
+	ofPushMatrix();
 
     if(!bEnableOcclusionDebug){
         ofTranslate(0, 0, 5.44);
@@ -509,6 +512,8 @@ void CloudsVisualSystemRGBDVideo::drawOcclusionLayer(){
     occlusionShader.setUniform2f("simplify", occlusionSimplifyX,occlusionSimplifyY);
     setupGeneralUniforms(occlusionShader);
     occlusionMesh.drawElements(GL_TRIANGLES, occlusionIndexCount);
+	player.unbind();
+
     occlusionShader.end();
 
     if(!bEnableOcclusionDebug){
@@ -518,23 +523,25 @@ void CloudsVisualSystemRGBDVideo::drawOcclusionLayer(){
         glDepthMask(GL_FALSE);
     }
 
-    glPopMatrix();
+	ofPopMatrix();
 }
 
 void CloudsVisualSystemRGBDVideo::drawMeshLayer(){
 
-	glPushMatrix();
+	ofPushMatrix();
 
     setupRGBDTransforms();
     ofSetColor(255, meshAlpha*255);
+
     meshShader.begin();
     meshShader.setUniform1f("edgeClip", 200);
     meshShader.setUniform2f("simplify", meshSimplifyX,meshSimplifyY);
     setupGeneralUniforms(meshShader);
     meshVbo.drawElements(GL_TRIANGLES, meshIndexCount);
+	player.unbind();
     meshShader.end();
 
-    glPopMatrix();
+	ofPopMatrix();
 }
 
 void CloudsVisualSystemRGBDVideo::drawPointLayer(){
@@ -554,6 +561,7 @@ void CloudsVisualSystemRGBDVideo::drawPointLayer(){
 	pointsShader.setUniform1f("alpha", pointAlpha);
 	setupGeneralUniforms(pointsShader);
 	points.drawVertices();
+	player.unbind();
 	pointsShader.end();
 
 	ofPopMatrix();

diff --git a/CloudsLibrary/src/VisualSystems/RGBDVideo/vs_src/CloudsVisualSystemRGBDVideo.h b/CloudsLibrary/src/VisualSystems/RGBDVideo/vs_src/CloudsVisualSystemRGBDVideo.h
@@ -50,11 +50,13 @@ class CloudsVisualSystemRGBDVideo : public CloudsVisualSystem {
 
     void selfSetupRenderGui();
     void guiRenderEvent(ofxUIEventArgs &e);
+
 
 	ofCamera& getCameraRef(){
 		return cloudsCamera;
 	}
 
+
   protected:
     bool bDrawVideoDebug;
 	ofVideoPlayer player;

diff --git a/CloudsVisualSystemTester/src/testApp.cpp b/CloudsVisualSystemTester/src/testApp.cpp
@@ -56,7 +56,6 @@ void testApp::setup(){
 
     blackList.clear();
 
-
     blackList.push_back(make_pair("Memory", "ThinBlueRows_2")); //crash in loadingPresetGUI
     blackList.push_back(make_pair("Memory", "ThinBlueRows_wide")); //crash in loadingPresetGUI
     blackList.push_back(make_pair("Memory", "ThinTealRows")); //crash in loadingPresetGUI

diff --git a/VSRGBDvideo/VSRGBDvideo.sln b/VSRGBDvideo/VSRGBDvideo.sln
@@ -10,42 +10,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VSRGBDvideo", "VSRGBDvideo.
 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

diff --git a/VSRGBDvideo/VSRGBDvideo.vcxproj b/VSRGBDvideo/VSRGBDvideo.vcxproj
@@ -126,7 +126,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\addons\ofxFTGL\src;..\..\..\addons\ofxFTGL\libs\FTGL\include;..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL;..\..\..\addons\ofxCameraSaveLoad\src\;..\..\..\addons\ofxOculusRift\src;..\..\..\addons\ofxOculusRift\libs\3rdParty\TinyXml;..\..\..\addons\ofxOculusRift\libs\LibOVR\Include;..\..\..\addons\ofxObjLoader\src;..\..\..\addons\ofxObjLoader\libs\glm;..\..\..\addons\ofxGenerative\src;..\CloudsLibrary\src\VisualSystemsLibrary;..\CloudsLibrary\src\VisualSystems\RGBDVideo\vs_src;..\CloudsLibrary\src\Input;..\CloudsLibrary\src\StoryEngine;..\CloudsLibrary\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\addons\ofxFTGL\src;..\..\..\addons\ofxFTGL\libs\FTGL\include;..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL;..\..\..\addons\ofxCameraSaveLoad\src\;..\..\..\addons\ofxCrypto\src;..\..\..\addons\ofxLocalization\src;..\..\..\addons\ofxSubtitles\src;..\..\..\addons\ofxObjLoader\src;..\..\..\addons\ofxObjLoader\libs\glm;..\..\..\addons\ofxGenerative\src;..\CloudsLibrary\src\VisualSystemsLibrary;..\CloudsLibrary\src\VisualSystems\RGBDVideo\vs_src;..\CloudsLibrary\src\Input;..\CloudsLibrary\src\Core;..\CloudsLibrary\src\StoryEngine;..\CloudsLibrary\src</AdditionalIncludeDirectories>
       <CompileAs>Default</CompileAs>
       <PrecompiledHeader />
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -135,8 +135,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalDependencies>libovr64d.lib;ftgl_static_D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\addons\ofxOculusRift\libs\LibOVR\Lib\x64;..\..\..\addons\ofxFTGL\libs\FTGL\lib\vs64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>ftgl_static_D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\addons\ofxFTGL\libs\FTGL\lib\vs64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>xcopy /e /i /y "$(ProjectDir)..\..\..\export\vs64\*.dll" "$(ProjectDir)bin"</Command>
@@ -173,7 +173,7 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\addons\ofxFTGL\src;..\..\..\addons\ofxFTGL\libs\FTGL\include;..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL;..\..\..\addons\ofxCameraSaveLoad\src\;..\..\..\addons\ofxOculusRift\src;..\..\..\addons\ofxOculusRift\libs\3rdParty\TinyXml;..\..\..\addons\ofxOculusRift\libs\LibOVR\Include;..\..\..\addons\ofxObjLoader\src;..\..\..\addons\ofxObjLoader\libs\glm;..\..\..\addons\ofxGenerative\src;..\CloudsLibrary\src\VisualSystemsLibrary;..\CloudsLibrary\src\VisualSystems\RGBDVideo\vs_src;..\CloudsLibrary\src\Input;..\CloudsLibrary\src\StoryEngine;..\CloudsLibrary\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\addons\ofxFTGL\src;..\..\..\addons\ofxFTGL\libs\FTGL\include;..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL;..\..\..\addons\ofxCameraSaveLoad\src\;..\..\..\addons\ofxCrypto\src;..\..\..\addons\ofxLocalization\src;..\..\..\addons\ofxSubtitles\src;..\..\..\addons\ofxObjLoader\src;..\..\..\addons\ofxObjLoader\libs\glm;..\..\..\addons\ofxGenerative\src;..\CloudsLibrary\src\VisualSystemsLibrary;..\CloudsLibrary\src\VisualSystems\RGBDVideo\vs_src;..\CloudsLibrary\src\Input;..\CloudsLibrary\src\Core;..\CloudsLibrary\src\StoryEngine;..\CloudsLibrary\src</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -184,15 +184,16 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalDependencies>libovr64.lib;ftgl_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\addons\ofxOculusRift\libs\LibOVR\Lib\x64;..\..\..\addons\ofxFTGL\libs\FTGL\lib\vs64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>ftgl_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\addons\ofxFTGL\libs\FTGL\lib\vs64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>xcopy /e /i /y "$(ProjectDir)..\..\..\export\vs64\*.dll" "$(ProjectDir)bin"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\addons\ofxCameraSaveLoad\src\ofxCameraSaveLoad.cpp" />
+    <ClCompile Include="..\..\..\addons\ofxCrypto\src\ofxCrypto.cpp" />
     <ClCompile Include="..\..\..\addons\ofxFTGL\src\ofxFTGLFont.cpp" />
     <ClCompile Include="..\..\..\addons\ofxFTGL\src\ofxFTGLSimpleLayout.cpp" />
     <ClCompile Include="..\..\..\addons\ofxGenerative\src\ofxBehavior.cpp" />
@@ -213,9 +214,14 @@
     <ClCompile Include="..\..\..\addons\ofxGenerative\src\ofxSwarmBehavior.cpp" />
     <ClCompile Include="..\..\..\addons\ofxGenerative\src\ofxVerletSolver.cpp" />
     <ClCompile Include="..\..\..\addons\ofxGenerative\src\ofxVortexBehavior.cpp" />
+    <ClCompile Include="..\..\..\addons\ofxLocalization\src\ofxLocalization.cpp" />
     <ClCompile Include="..\..\..\addons\ofxObjLoader\libs\glm\glm.c" />
     <ClCompile Include="..\..\..\addons\ofxObjLoader\src\ofxObjLoader.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxOculusRift\src\ofxOculusRift.cpp" />
+    <ClCompile Include="..\..\..\addons\ofxSubtitles\src\ofxSubtitles.cpp" />
+    <ClCompile Include="..\..\..\addons\ofxSubtitles\src\ofxSubtitleUnit.cpp" />
+    <ClCompile Include="..\CloudsLibrary\src\CloudsGlobal.cpp" />
+    <ClCompile Include="..\CloudsLibrary\src\CloudsLocalization.cpp" />
+    <ClCompile Include="..\CloudsLibrary\src\Core\CloudsCalibrationNode.cpp" />
     <ClCompile Include="..\CloudsLibrary\src\Input\CloudsInput.cpp" />
     <ClCompile Include="..\CloudsLibrary\src\Input\CloudsInputMouse.cpp" />
     <ClCompile Include="..\CloudsLibrary\src\VisualSystemsLibrary\CloudsRGBDCamera.cpp" />
@@ -227,6 +233,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\addons\ofxCameraSaveLoad\src\ofxCameraSaveLoad.h" />
+    <ClInclude Include="..\..\..\addons\ofxCrypto\src\ofxCrypto.h" />
     <ClInclude Include="..\..\..\addons\ofxFTGL\src\ofxFTGL.h" />
     <ClInclude Include="..\..\..\addons\ofxFTGL\src\ofxFTGLFont.h" />
     <ClInclude Include="..\..\..\addons\ofxFTGL\src\ofxFTGLSimpleLayout.h" />
@@ -269,10 +276,15 @@
     <ClInclude Include="..\..\..\addons\ofxGenerative\src\ofxTrailParticle.h" />
     <ClInclude Include="..\..\..\addons\ofxGenerative\src\ofxVerletSolver.h" />
     <ClInclude Include="..\..\..\addons\ofxGenerative\src\ofxVortexBehavior.h" />
+    <ClInclude Include="..\..\..\addons\ofxLocalization\src\ofxLocalization.h" />
     <ClInclude Include="..\..\..\addons\ofxObjLoader\libs\glm\glm.h" />
     <ClInclude Include="..\..\..\addons\ofxObjLoader\src\ofxObjLoader.h" />
-    <ClInclude Include="..\..\..\addons\ofxOculusRift\src\ofxOculusRift.h" />
+    <ClInclude Include="..\..\..\addons\ofxSubtitles\src\ofxSubtitles.h" />
+    <ClInclude Include="..\..\..\addons\ofxSubtitles\src\ofxSubtitleUnit.h" />
+    <ClInclude Include="..\CloudsLibrary\src\CloudsCrypto.h" />
     <ClInclude Include="..\CloudsLibrary\src\CloudsGlobal.h" />
+    <ClInclude Include="..\CloudsLibrary\src\CloudsLocalization.h" />
+    <ClInclude Include="..\CloudsLibrary\src\Core\CloudsCalibrationNode.h" />
     <ClInclude Include="..\CloudsLibrary\src\Input\CloudsInput.h" />
     <ClInclude Include="..\CloudsLibrary\src\Input\CloudsInputEvents.h" />
     <ClInclude Include="..\CloudsLibrary\src\Input\CloudsInputMouse.h" />

diff --git a/VSRGBDvideo/VSRGBDvideo.vcxproj.filters b/VSRGBDvideo/VSRGBDvideo.vcxproj.filters
@@ -7,9 +7,6 @@
     <ClCompile Include="src\main.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\addons\ofxOculusRift\src\ofxOculusRift.cpp">
-      <Filter>addons\ofxOculusRift\src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\addons\ofxFTGL\src\ofxFTGLFont.cpp">
       <Filter>addons\ofxFTGL\src</Filter>
     </ClCompile>
@@ -97,6 +94,27 @@
     <ClCompile Include="..\CloudsLibrary\src\VisualSystems\RGBDVideo\vs_src\CloudsVisualSystemRGBDVideo.cpp">
       <Filter>CloudsLibrary\src\VisualSystems\RGBDvideo\vs_src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\addons\ofxCrypto\src\ofxCrypto.cpp">
+      <Filter>addons\ofxCrypto\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\addons\ofxLocalization\src\ofxLocalization.cpp">
+      <Filter>addons\ofxLocalization\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\addons\ofxSubtitles\src\ofxSubtitleUnit.cpp">
+      <Filter>addons\ofxSubtitles\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\addons\ofxSubtitles\src\ofxSubtitles.cpp">
+      <Filter>addons\ofxSubtitles\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CloudsLibrary\src\Core\CloudsCalibrationNode.cpp">
+      <Filter>CloudsLibrary\src\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CloudsLibrary\src\CloudsGlobal.cpp">
+      <Filter>CloudsLibrary\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CloudsLibrary\src\CloudsLocalization.cpp">
+      <Filter>CloudsLibrary\src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="src">
@@ -105,12 +123,6 @@
     <Filter Include="addons">
       <UniqueIdentifier>{014ab87c-b1ee-4040-b3e5-4168bea9bf0c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="addons\ofxOculusRift">
-      <UniqueIdentifier>{599ff151-b55e-4f90-811c-ddc762158741}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="addons\ofxOculusRift\src">
-      <UniqueIdentifier>{63afbfed-3fa9-423b-a6a5-72803b5300b1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="addons\ofxFTGL">
       <UniqueIdentifier>{f6f83f01-142d-486b-945e-d50972bd9aab}</UniqueIdentifier>
     </Filter>
@@ -159,14 +171,32 @@
     <Filter Include="CloudsLibrary\src\VisualSystems\RGBDvideo\vs_src">
       <UniqueIdentifier>{a5bd867b-a290-4d82-b6a2-d558ce1ca61f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="addons\ofxCrypto">
+      <UniqueIdentifier>{0e73596a-0ceb-4674-9b6e-0980b398afc3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxCrypto\src">
+      <UniqueIdentifier>{5ede272e-9dc1-4c44-91e6-18f5c45316e7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxLocalization">
+      <UniqueIdentifier>{7ce6a6ea-8ad8-49f8-bc15-47d1b0e36f6a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxLocalization\src">
+      <UniqueIdentifier>{f95f63ef-b3ce-47ab-a68e-1605fc333fda}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxSubtitles">
+      <UniqueIdentifier>{e13cb32e-a3c3-4476-bc89-3c62f3ddbb5b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxSubtitles\src">
+      <UniqueIdentifier>{6e4cb6b8-1259-4477-a40e-fe742de5b07e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CloudsLibrary\src\Core">
+      <UniqueIdentifier>{1b9017f8-4d9d-4e4d-8d42-d5070242ecc6}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\testApp.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\addons\ofxOculusRift\src\ofxOculusRift.h">
-      <Filter>addons\ofxOculusRift\src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\addons\ofxFTGL\src\ofxFTGL.h">
       <Filter>addons\ofxFTGL\src</Filter>
     </ClInclude>
@@ -329,6 +359,27 @@
     <ClInclude Include="..\CloudsLibrary\src\VisualSystems\RGBDVideo\vs_src\CloudsVisualSystemRGBDVideo.h">
       <Filter>CloudsLibrary\src\VisualSystems\RGBDvideo\vs_src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\addons\ofxCrypto\src\ofxCrypto.h">
+      <Filter>addons\ofxCrypto\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\addons\ofxLocalization\src\ofxLocalization.h">
+      <Filter>addons\ofxLocalization\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\addons\ofxSubtitles\src\ofxSubtitles.h">
+      <Filter>addons\ofxSubtitles\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\addons\ofxSubtitles\src\ofxSubtitleUnit.h">
+      <Filter>addons\ofxSubtitles\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CloudsLibrary\src\Core\CloudsCalibrationNode.h">
+      <Filter>CloudsLibrary\src\Core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CloudsLibrary\src\CloudsCrypto.h">
+      <Filter>CloudsLibrary\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CloudsLibrary\src\CloudsLocalization.h">
+      <Filter>CloudsLibrary\src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="icon.rc" />