Skip to content

Commit

Permalink
voro vs files and added rift rendering settings
Browse files Browse the repository at this point in the history
  • Loading branch information
@obviousjim
obviousjim committed May 28, 2014
1 parent 69ab519 commit 26444f9
Show file tree
Hide file tree
Showing 12 changed files with 5,868 additions and 57 deletions.
4,315 changes: 4,315 additions & 0 deletions CloudsData/visualsystems/Swim/models/plotva.obj
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CloudsLibrary/src/VisualSystems/OpenP5Spaghetti/vs_src/CloudsVisualSystemOpenP5Spaghetti.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ void CloudsVisualSystemOpenP5Spaghetti::regenerate(){
//shouldn't PRELOADS should happen in regenerate...?
for (int j = 0; j<numPreloads; j++){
selfUpdate();
cout << "preloaded " << j << "times" << endl;
// cout << "preloaded " << j << "times" << endl;
//selfDraw();
}

Expand Down
3 changes: 2 additions & 1 deletion CloudsLibrary/src/VisualSystems/Swim/vs_src/Creatures.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ namespace itg
maxDistFromCentre = 2000.f;

// fish one

ModelCreature::fishModels.push_back(ofxAssimpModelLoader());
ModelCreature::fishModels.back().loadModel(dataPath + "models/plotva.3ds");
ModelCreature::fishModels.back().loadModel(dataPath + "models/plotva.obj");
ModelCreature::fishModels.back().setRotation(0, 180, 0, 0, 1);
ModelCreature::fishModels.back().setRotation(1, 90, 0, 1, 0);
ModelCreature::fishModels.back().setScale(0.3, 0.3, 0.3);
Expand Down
9 changes: 8 additions & 1 deletion CloudsLibrary/src/VisualSystemsLibrary/CloudsVisualSystem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,15 @@ void CloudsVisualSystem::get2dMesh(ofMesh& mesh, float width, float height){
static ofxOculusRift oculusRift;
ofxOculusRift& CloudsVisualSystem::getOculusRift(){
if(!oculusRift.isSetup()){

ofFbo::Settings renderSettings;
renderSettings.useDepth = true;
renderSettings.numSamples = 4;
renderSettings.depthStencilInternalFormat = GL_DEPTH_COMPONENT32F;
renderSettings.internalformat = GL_RGB;

checkOpenGLError("PRE SETUP OCULUS");
oculusRift.setup();
oculusRift.setup(renderSettings);
checkOpenGLError("POST SETUP OCULUS");
}

Expand Down
542 changes: 493 additions & 49 deletions CloudsVisualSystemTester/fmod.log
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CloudsVisualSystemTester/src/testApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ void testApp::advanceSystem(){
auto it = blackList.begin();
auto end = blackList.end();
while(it != end){
cout<<"compare: "<< preset.presetName << " " << it->second <<endl;
if( preset.presetName == it->second ){
allow = false;
break;
Expand Down Expand Up @@ -151,6 +150,7 @@ void testApp::advanceSystem(){
toLog( "success " + to_string(elapsedTime(shortStartTime)) + "ms \n");
toLog( "beginning setDrawToScreen -- ");
currentSystem->setDrawToScreen(false);
currentSystem->setNumSamples(4);
toLog( "success \n");
toLog( "beginning playSystem -- ");
shortStartTime = ofGetElapsedTimef();
Expand Down
91 changes: 91 additions & 0 deletions VSVoro/VSVoro.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
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}") = "VSVoro", "VSVoro.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_Oculus|Win32 = Debug_Oculus|Win32
Debug_Oculus|x64 = Debug_Oculus|x64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release_Oculus|Win32 = Release_Oculus|Win32
Release_Oculus|x64 = Release_Oculus|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug_Oculus|Win32.ActiveCfg = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug_Oculus|Win32.Build.0 = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug_Oculus|x64.ActiveCfg = Debug|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug_Oculus|x64.Build.0 = Debug|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|x64
{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_Oculus|Win32.ActiveCfg = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release_Oculus|Win32.Build.0 = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release_Oculus|x64.ActiveCfg = Release|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release_Oculus|x64.Build.0 = Release|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_Oculus|Win32.ActiveCfg = Debug|Win32
{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug_Oculus|Win32.Build.0 = Debug|Win32
{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug_Oculus|x64.ActiveCfg = Debug|x64
{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug_Oculus|x64.Build.0 = Debug|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_Oculus|Win32.ActiveCfg = Release|Win32
{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release_Oculus|Win32.Build.0 = Release|Win32
{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release_Oculus|x64.ActiveCfg = Release|x64
{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release_Oculus|x64.Build.0 = Release|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_Oculus|Win32.ActiveCfg = Debug|Win32
{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug_Oculus|Win32.Build.0 = Debug|Win32
{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug_Oculus|x64.ActiveCfg = Debug|x64
{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug_Oculus|x64.Build.0 = Debug|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_Oculus|Win32.ActiveCfg = Release|Win32
{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release_Oculus|Win32.Build.0 = Release|Win32
{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release_Oculus|x64.ActiveCfg = Release|x64
{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release_Oculus|x64.Build.0 = Release|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_Oculus|Win32.ActiveCfg = Debug_Oculus|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug_Oculus|Win32.Build.0 = Debug_Oculus|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug_Oculus|x64.ActiveCfg = Debug_Oculus|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug_Oculus|x64.Build.0 = Debug_Oculus|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_Oculus|Win32.ActiveCfg = Release_Oculus|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release_Oculus|Win32.Build.0 = Release_Oculus|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release_Oculus|x64.ActiveCfg = Release_Oculus|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release_Oculus|x64.Build.0 = Release_Oculus|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
Loading

0 comments on commit 26444f9

Please sign in to comment.