Skip to content

Commit

Permalink
fixing stuff for IDFA
Browse files Browse the repository at this point in the history
  • Loading branch information
@obviousjim
obviousjim committed Nov 2, 2014
1 parent 0f954fe commit 2e15e31
Show file tree
Hide file tree
Showing 9 changed files with 308 additions and 36 deletions.
8 changes: 4 additions & 4 deletions CLOUDS/src/testApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ void testApp::setup(){
playerSetup = false;
shouldSetupPlayer = false;
#ifdef OCULUS_RIFT
// loader.loadImage("OCULUS_BG_HD.png");0
loader.loadImage("CLOUDS_HD_BG_DOUBLE.jpg");
loader.loadImage("OCULUS_BG_HD.png");
// loader.loadImage("CLOUDS_HD_BG_DOUBLE.jpg");
#else
loader.loadImage("SCREEN_BG.png");
#endif

ofSetWindowShape(1080*2,1920);
ofSetWindowPosition(0,0);
// ofSetWindowShape(1080*2,1920);
// ofSetWindowPosition(0,0);

}

Expand Down
21 changes: 11 additions & 10 deletions CloudsData/links/visualsystems_keywords_db.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16803,7 +16803,7 @@
<comments></comments>
<grade>A</grade>
<enabled>1</enabled>
<oculus>1</oculus>
<oculus>0</oculus>
<sound_exclude_vo>0</sound_exclude_vo>
<sound_allow_vo>0</sound_allow_vo>
<interlude>0</interlude>
Expand Down Expand Up @@ -16901,7 +16901,7 @@
<comments></comments>
<grade></grade>
<enabled>1</enabled>
<oculus>1</oculus>
<oculus>0</oculus>
<sound_exclude_vo>0</sound_exclude_vo>
<sound_allow_vo>0</sound_allow_vo>
<interlude>0</interlude>
Expand Down Expand Up @@ -35893,8 +35893,8 @@
</suppressions>
<comments></comments>
<grade></grade>
<enabled>0</enabled>
<oculus>0</oculus>
<enabled>1</enabled>
<oculus>1</oculus>
<sound_exclude_vo>0</sound_exclude_vo>
<sound_allow_vo>0</sound_allow_vo>
<interlude>0</interlude>
Expand Down Expand Up @@ -35941,8 +35941,8 @@
</suppressions>
<comments></comments>
<grade></grade>
<enabled>0</enabled>
<oculus>0</oculus>
<enabled>1</enabled>
<oculus>1</oculus>
<sound_exclude_vo>0</sound_exclude_vo>
<sound_allow_vo>0</sound_allow_vo>
<interlude>0</interlude>
Expand All @@ -35969,8 +35969,8 @@
</suppressions>
<comments></comments>
<grade></grade>
<enabled>0</enabled>
<oculus>0</oculus>
<enabled>1</enabled>
<oculus>1</oculus>
<sound_exclude_vo>0</sound_exclude_vo>
<sound_allow_vo>0</sound_allow_vo>
<interlude>0</interlude>
Expand Down Expand Up @@ -36140,7 +36140,7 @@
<comments></comments>
<grade></grade>
<enabled>0</enabled>
<oculus>0</oculus>
<oculus>1</oculus>
<sound_exclude_vo>0</sound_exclude_vo>
<sound_allow_vo>0</sound_allow_vo>
<interlude>0</interlude>
Expand Down Expand Up @@ -36174,7 +36174,7 @@
</suppressions>
<comments></comments>
<grade></grade>
<enabled>0</enabled>
<enabled>1</enabled>
<oculus>0</oculus>
<sound_exclude_vo>0</sound_exclude_vo>
<sound_allow_vo>0</sound_allow_vo>
Expand Down Expand Up @@ -40717,6 +40717,7 @@
<clip>Kevin - algo stories 1</clip>
<clip>Kevin - algo stories 2</clip>
<clip>Kyle_MC - folowing the finger</clip>
<clip>Karsten - infinite conversation</clip>
<clip>Marcus - code for storytelling</clip>
<clip>Nervous_Jessica - RNA and Viruses</clip>
<clip>Patricio - Dream of eggs</clip>
Expand Down
8 changes: 7 additions & 1 deletion CloudsLibrary/src/VisualSystems/TunnelDrawing/vs_src/CloudsVisualSystemTunnelDrawing.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ void CloudsVisualSystemTunnelDrawing::selfSetDefaults(){
#endif
primaryCursorMode = CURSOR_MODE_DRAW;
secondaryCursorMode = CURSOR_MODE_DRAW;

#ifdef OCULUS_RIFT
camera.begin();
camera.end();
#endif

}

//These methods let us add custom GUI parameters and respond to their events
Expand Down Expand Up @@ -107,7 +113,7 @@ void CloudsVisualSystemTunnelDrawing::selfSceneTransformation(){

//normal update call
void CloudsVisualSystemTunnelDrawing::selfUpdate(){

#ifndef MOUSE_INPUT
map<int, CloudsInteractionEventArgs>::iterator init;
for(init = GetCloudsInputPoints().begin(); init != GetCloudsInputPoints().end(); init++){
Expand Down
5 changes: 3 additions & 2 deletions CloudsLibrary/src/VisualSystemsLibrary/CloudsVisualSystem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3886,10 +3886,11 @@ void CloudsVisualSystem::selfPostDraw(int width, int height){
#ifdef OCULUS_RIFT

//THIS WAY TO JUST DRAW
//oculusRift.draw();
oculusRift.draw();


//THIS WAY TO DRAW FOR FANCY DK2 MIRRORING
/*
oculusTarget.begin();
oculusRift.draw();
oculusTarget.end();
Expand Down Expand Up @@ -3925,7 +3926,7 @@ void CloudsVisualSystem::selfPostDraw(int width, int height){
oculusTarget.getTextureReference().bind();
oculusTargetMesh.draw();
oculusTarget.getTextureReference().unbind();

*/

#else
int offset;
Expand Down
18 changes: 18 additions & 0 deletions VSTunnelDrawing/VSTunnelDrawing.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxTimelineLib", "..\..\..\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VSTunnelDrawing", "VSTunnelDrawing.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxOculusDK2Lib", "..\..\..\addons\ofxOculusDK2\ofxOculusDK2Lib\ofxOculusDK2Lib.vcxproj", "{06DF4A39-7102-462B-8F20-FC26E9A93826}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_Oculus|Win32 = Debug_Oculus|Win32
Expand Down Expand Up @@ -84,6 +86,22 @@ Global
{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
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Debug_Oculus|Win32.ActiveCfg = Debug|Win32
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Debug_Oculus|Win32.Build.0 = Debug|Win32
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Debug_Oculus|x64.ActiveCfg = Debug|x64
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Debug_Oculus|x64.Build.0 = Debug|x64
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Debug|Win32.ActiveCfg = Debug|Win32
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Debug|Win32.Build.0 = Debug|Win32
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Debug|x64.ActiveCfg = Debug|x64
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Debug|x64.Build.0 = Debug|x64
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Release_Oculus|Win32.ActiveCfg = Release|Win32
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Release_Oculus|Win32.Build.0 = Release|Win32
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Release_Oculus|x64.ActiveCfg = Release|x64
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Release_Oculus|x64.Build.0 = Release|x64
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Release|Win32.ActiveCfg = Release|Win32
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Release|Win32.Build.0 = Release|Win32
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Release|x64.ActiveCfg = Release|x64
{06DF4A39-7102-462B-8F20-FC26E9A93826}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
19 changes: 12 additions & 7 deletions VSTunnelDrawing/VSTunnelDrawing.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksRelease.props" />
<Import Project="..\..\..\addons\ofxUI\ofxUILib\ofxUI.props" />
<Import Project="..\..\..\addons\ofxTimeline\ofxTimelineLib\ofxTimeline.props" />
<Import Project="..\..\..\addons\ofxOculusDK2\ofxOculusDK2Lib\ofxOculusDK2.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
Expand All @@ -109,6 +110,7 @@
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksRelease64.props" />
<Import Project="..\..\..\addons\ofxUI\ofxUILib\ofxUI.props" />
<Import Project="..\..\..\addons\ofxTimeline\ofxTimelineLib\ofxTimeline64.props" />
<Import Project="..\..\..\addons\ofxOculusDK2\ofxOculusDK2Lib\ofxOculusDK2.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
Expand All @@ -121,6 +123,7 @@
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksDebug.props" />
<Import Project="..\..\..\addons\ofxUI\ofxUILib\ofxUI.props" />
<Import Project="..\..\..\addons\ofxTimeline\ofxTimelineLib\ofxTimeline.props" />
<Import Project="..\..\..\addons\ofxOculusDK2\ofxOculusDK2Lib\ofxOculusDK2.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
Expand All @@ -133,6 +136,7 @@
<Import Project="..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksDebug64.props" />
<Import Project="..\..\..\addons\ofxUI\ofxUILib\ofxUI.props" />
<Import Project="..\..\..\addons\ofxTimeline\ofxTimelineLib\ofxTimeline64.props" />
<Import Project="..\..\..\addons\ofxOculusDK2\ofxOculusDK2Lib\ofxOculusDK2.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand Down Expand Up @@ -255,7 +259,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\TunnelDrawing\vs_src;..\CloudsLibrary\src\Input;..\CloudsLibrary\src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\addons\ofxFTGL\src;..\..\..\addons\ofxFTGL\libs\FTGL\include;..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL;..\..\..\addons\ofxCameraSaveLoad\src\;..\..\..\addons\ofxObjLoader\src;..\..\..\addons\ofxObjLoader\libs\glm;..\..\..\addons\ofxGenerative\src;..\CloudsLibrary\src\VisualSystemsLibrary;..\CloudsLibrary\src\VisualSystems\TunnelDrawing\vs_src;..\CloudsLibrary\src\Input;..\CloudsLibrary\src</AdditionalIncludeDirectories>
<CompileAs>Default</CompileAs>
<PrecompiledHeader>
</PrecompiledHeader>
Expand All @@ -265,8 +269,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>
Expand Down Expand Up @@ -361,8 +365,8 @@
<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>
Expand Down Expand Up @@ -392,7 +396,6 @@
<ClCompile Include="..\..\..\addons\ofxGenerative\src\ofxVortexBehavior.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="..\CloudsLibrary\src\Input\CloudsInput.cpp" />
<ClCompile Include="..\CloudsLibrary\src\Input\CloudsInputMouse.cpp" />
<ClCompile Include="..\CloudsLibrary\src\Input\CloudsInputOculus.cpp" />
Expand Down Expand Up @@ -449,7 +452,6 @@
<ClInclude Include="..\..\..\addons\ofxGenerative\src\ofxVortexBehavior.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="..\CloudsLibrary\src\CloudsGlobal.h" />
<ClInclude Include="..\CloudsLibrary\src\Input\CloudsInput.h" />
<ClInclude Include="..\CloudsLibrary\src\Input\CloudsInputEvents.h" />
Expand All @@ -463,6 +465,9 @@
<ClInclude Include="src\testApp.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\addons\ofxOculusDK2\ofxOculusDK2Lib\ofxOculusDK2Lib.vcxproj">
<Project>{06df4a39-7102-462b-8f20-fc26e9a93826}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\addons\ofxTimeline\ofxTimelineLib\ofxTimelineLib.vcxproj">
<Project>{a72c4f16-cb16-4143-ba5c-5e4fa802d636}</Project>
</ProjectReference>
Expand Down
12 changes: 0 additions & 12 deletions VSTunnelDrawing/VSTunnelDrawing.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -108,12 +105,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>
Expand Down Expand Up @@ -164,9 +155,6 @@
<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>
Expand Down
Loading

0 comments on commit 2e15e31

Please sign in to comment.