Skip to content

Commit

Permalink
3D model loader fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@obviousjim
obviousjim committed May 26, 2014
1 parent b4bd1c0 commit 5dc3156
Show file tree
Hide file tree
Showing 58 changed files with 1,743 additions and 1,064 deletions.
5 changes: 3 additions & 2 deletions CLOUDS/CLOUDS.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
<GenerateManifest>true</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Oculus|x64'">
<TargetName>$(ProjectName)_debug</TargetName>
<TargetName>$(ProjectName)_OCULUS_debug</TargetName>
<LinkIncremental>true</LinkIncremental>
<GenerateManifest>true</GenerateManifest>
</PropertyGroup>
Expand All @@ -197,6 +197,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Oculus|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)_OCULUS</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand Down Expand Up @@ -290,7 +291,7 @@ xcopy /e /i /y "$(ProjectDir)..\..\..\addons\ofxTonic\libs\sndfile\export\vs64\*
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalDependencies>ftgl_static_D.lib;assimp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\addons\ofxFTGL\libs\FTGL\lib\vs64;..\..\..\addons\ofxAssimpModelLoader\libs\assimp\lib\vs64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<OutputFile>$(OutDir)$(TargetName)_OCULUS$(TargetExt)</OutputFile>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
</Link>
<PostBuildEvent>
<Command>xcopy /e /i /y "$(ProjectDir)..\..\..\export\vs64\*.dll" "$(ProjectDir)bin"
Expand Down
2 changes: 1 addition & 1 deletion CloudsData/sound/mix.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0.2
0 0.2
1 0.4
10 0.1
100 0.25
Expand Down
70 changes: 35 additions & 35 deletions CloudsData/visualsystems/3DModelLoader/Presets/BigBlueCube/modelUIGui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,176 +37,176 @@
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Assasin_triangualated.obj</Name>
<Name>Assasin_triangualated.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>BigCube_ErrodedTriangulate.obj</Name>
<Name>BigCube_ErrodedTriangulate.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>BigCube_triangulate.obj</Name>
<Name>BigCube_triangulate.obm</Name>
<Value>1</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>CheesePuffsTriangulated.obj</Name>
<Name>CheesePuffsTriangulated.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>elephant.obj</Name>
<Name>elephant.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>ellipsoid1.obj</Name>
<Name>ellipsoid1.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>ellipsoid2(2).obj</Name>
<Name>ellipsoid2(2).obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>ellipsoid2.obj</Name>
<Name>ellipsoid2.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>eyeball__obj.obj</Name>
<Name>eyeball__obj.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>FallenCubes_Triangulated.obj</Name>
<Name>FallenCubes_Triangulated.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>FallingChairs_Triangulated.obj</Name>
<Name>FallingChairs_Triangulated.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>folding-small-simplified.obj</Name>
<Name>folding-small-simplified.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Hive_triangulated1.obj</Name>
<Name>Hive_triangulated1.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Hive_triangulated2.obj</Name>
<Name>Hive_triangulated2.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Hive_Triangulated3.obj</Name>
<Name>Hive_Triangulated3.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>house_wood.obj</Name>
<Name>house_wood.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Hypersphere1.obj</Name>
<Name>Hypersphere1.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Kelp.obj</Name>
<Name>Kelp.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Kelp2.obj</Name>
<Name>Kelp2.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Laplacian1.obj</Name>
<Name>Laplacian1.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Laplacian2.obj</Name>
<Name>Laplacian2.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Man.obj</Name>
<Name>Man.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Man_Bicycle.obj</Name>
<Name>Man_Bicycle.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>MegaSphere.obj</Name>
<Name>MegaSphere.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>NestedBrokenSphere.obj</Name>
<Name>NestedBrokenSphere.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>pathDebugModel.obj</Name>
<Name>pathDebugModel.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>StackofChairs_Triangulated.obj</Name>
<Name>StackofChairs_Triangulated.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>SucculentTriangulated.obj</Name>
<Name>SucculentTriangulated.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Tangle_Triangulated.obj</Name>
<Name>Tangle_Triangulated.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Toxi_Ellipsoid.obj</Name>
<Name>Toxi_Ellipsoid.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>ToxiAllInOne.obj</Name>
<Name>ToxiAllInOne.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Trachia.obj</Name>
<Name>Trachia.obm</Name>
<Value>1</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>tube1.obj</Name>
<Name>tube1.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>voronoi.obj</Name>
<Name>voronoi.obm</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>Vortex_Triangulated.obj</Name>
<Name>Vortex_Triangulated.obm</Name>
<Value>0</Value>
</Widget>
Loading

0 comments on commit 5dc3156

Please sign in to comment.