diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake --- ogre.orig/CMake/InstallResources.cmake 2014-03-31 16:44:40.544894640 -0300 +++ ogre/CMake/InstallResources.cmake 2014-03-31 16:59:12.012359302 -0300 @@ -116,9 +116,6 @@ # create plugins.cfg configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg) configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg) -# create quakemap.cfg -configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg) -configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg) # create samples.cfg configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg) configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg) @@ -133,7 +130,6 @@ ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg ${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg - ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug ) install(FILES @@ -141,7 +137,6 @@ ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None "" ) install(FILES @@ -149,7 +144,6 @@ ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo ) install(FILES @@ -157,7 +151,6 @@ ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel ) @@ -168,7 +161,6 @@ ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" ) endif() @@ -219,11 +211,6 @@ configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins.cfg) configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg) configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins.cfg) - # create quakemap.cfg - configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/quakemap_d.cfg) - configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/release/quakemap.cfg) - configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/quakemap.cfg) - configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/quakemap.cfg) # create samples.cfg configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/samples_d.cfg) configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/release/samples.cfg) @@ -243,8 +230,6 @@ configure_file(${OGRE_TEMPLATES_DIR}/resources${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/resources${OGRE_CFG_SUFFIX}.cfg) # create plugins.cfg configure_file(${OGRE_TEMPLATES_DIR}/plugins${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/plugins${OGRE_CFG_SUFFIX}.cfg) - # create quakemap.cfg - configure_file(${OGRE_TEMPLATES_DIR}/quakemap${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/quakemap${OGRE_CFG_SUFFIX}.cfg) # create samples.cfg configure_file(${OGRE_TEMPLATES_DIR}/samples${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/samples${OGRE_CFG_SUFFIX}.cfg) # create tests.cfg diff -Nur ogre.orig/CMake/Templates/Android_resources.cfg.in ogre/CMake/Templates/Android_resources.cfg.in --- ogre.orig/CMake/Templates/Android_resources.cfg.in 2014-03-31 16:44:40.591560636 -0300 +++ ogre/CMake/Templates/Android_resources.cfg.in 2014-03-31 17:02:01.633252779 -0300 @@ -12,7 +12,6 @@ APKFileSystem=/materials/programs/GLSLES APKFileSystem=/materials/scripts APKFileSystem=/materials/textures -APKFileSystem=/materials/textures/nvidia APKFileSystem=/models APKFileSystem=/particle APKFileSystem=/RTShaderLib diff -Nur ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in ogre/CMake/Templates/SDK_CMakeLists.txt.in --- ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in 2014-03-31 16:44:40.618226919 -0300 +++ ogre/CMake/Templates/SDK_CMakeLists.txt.in 2014-03-31 16:59:35.715351689 -0300 @@ -245,7 +245,6 @@ configure_file(${OGRE_SOURCE_DIR}/plugins.cfg ${OGRE_BINARY_DIR}/bin/plugins.cfg COPYONLY) configure_file(${OGRE_SOURCE_DIR}/resources.cfg ${OGRE_BINARY_DIR}/bin/resources.cfg COPYONLY) configure_file(${OGRE_SOURCE_DIR}/samples.cfg ${OGRE_BINARY_DIR}/bin/samples.cfg COPYONLY) - configure_file(${OGRE_SOURCE_DIR}/quakemap.cfg ${OGRE_BINARY_DIR}/bin/quakemap.cfg COPYONLY) endif () if (MINGW) diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demomedia.wxi.in --- ogre.orig/CMake/Templates/demomedia.wxi.in 2014-03-31 16:44:40.628226774 -0300 +++ ogre/CMake/Templates/demomedia.wxi.in 2014-03-31 16:51:57.408610715 -0300 @@ -295,13 +295,6 @@ <ComponentRef Id="cmpA1FEB51B0386689568AAFC22E0D71B6B" /> <ComponentRef Id="cmpA3F7363F0553143ABF1CA52A2FD433D6" /> <ComponentRef Id="cmp0344A18C23958D312C044A6E8443CD9D" /> - <ComponentRef Id="cmp30B19313C1A692A69AC9C275E4E5D5CC" /> - <ComponentRef Id="cmp376B3837DF007338AC14AB58C726A8B1" /> - <ComponentRef Id="cmp02B151F3B587EAF5AF116E6A3B09E247" /> - <ComponentRef Id="cmpFA2310874B7C3D5229AF9BEACAF6746A" /> - <ComponentRef Id="cmpB11E2174087D0D3FC791806231C1DBF5" /> - <ComponentRef Id="cmpF00ABD2DB6C6A8D718E0E4B5CD6B1C09" /> - <ComponentRef Id="cmpA603C50287BBE370F0BDF5FBE7A3233F" /> <ComponentRef Id="cmpEA39DA48CA01586DF3412795541AD2FC" /> <ComponentRef Id="cmp50C3E068724D3C32847EEB132308B147" /> <ComponentRef Id="cmp78D10E140133F6977C74A8F912B2B217" /> @@ -328,8 +321,6 @@ <ComponentRef Id="cmpDFD58144C55506C82E22CF1AC14714B8" /> <ComponentRef Id="cmp9BF13256D468C8147B7050A93B09C032" /> <ComponentRef Id="cmp86F908FD9E8E5FFAD0C2D9A37A098E4C" /> - <ComponentRef Id="cmpDEED3FE7C35E18D0FA59B8BB3DF42244" /> - <ComponentRef Id="cmp98499D3076FA7324AFE1F9F8D10FB421" /> <ComponentRef Id="cmp532E67011B733ACE674692F6ED52775D" /> <ComponentRef Id="cmp572AE70CCC0D85E8DA35F87B45768634" /> <ComponentRef Id="cmp013036935784DEC9BAE62831C93EFA18" /> @@ -1338,29 +1329,6 @@ <Component Id="cmp0344A18C23958D312C044A6E8443CD9D" Guid="{E47FE6B7-B6BD-4FCA-A903-87281A6B8CEB}"> <File Id="fil39C72570EB0CBAC9AF4FF900C2D5D525" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\WoodPallet.png" /> </Component> - <Directory Id="dir11696C93BEAB38C45931BCBDDB2A6789" Name="nvidia"> - <Component Id="cmp30B19313C1A692A69AC9C275E4E5D5CC" Guid="{68CA4BF9-5A51-400F-B5C2-701A4DA8D331}"> - <File Id="fil40BA6B2C4D12AD2C5710179390B9D2DB" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds" /> - </Component> - <Component Id="cmp376B3837DF007338AC14AB58C726A8B1" Guid="{CF5BBEF1-4E44-46E9-8373-4FF589D19F6F}"> - <File Id="fil6A9EC7DE38E4F700741187344AAB9A4C" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\dirt_grayrocky_normalheight.dds" /> - </Component> - <Component Id="cmp02B151F3B587EAF5AF116E6A3B09E247" Guid="{EB6D162E-A67A-4CD1-948D-66B84457AFBD}"> - <File Id="fil30FFE3069E40D44C734E168BEB336DA0" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\grass_green-01_diffusespecular.dds" /> - </Component> - <Component Id="cmpFA2310874B7C3D5229AF9BEACAF6746A" Guid="{C6E468AC-67EE-44C6-9F01-69D369D966FC}"> - <File Id="fil4C7A93A8C53E76F5F5ED65D1F52659DD" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\grass_green-01_normalheight.dds" /> - </Component> - <Component Id="cmpB11E2174087D0D3FC791806231C1DBF5" Guid="{3A30B7B3-6D8D-4475-B31E-5626B54DD65B}"> - <File Id="fil909FAC7A36B3EA5B9F4660701BEC09F5" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds" /> - </Component> - <Component Id="cmpF00ABD2DB6C6A8D718E0E4B5CD6B1C09" Guid="{EE4979FF-6320-432A-98B2-F183BCAC197A}"> - <File Id="fil23D0DB8C9CA160970B9C29DD8F77B5CF" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds" /> - </Component> - <Component Id="cmpA603C50287BBE370F0BDF5FBE7A3233F" Guid="{E8AD7243-C2F2-4C00-AE8E-DC38E20927FA}"> - <File Id="fil6A4613F0DA3B5B562C5C68C05DFF0171" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\TextureUsageAgreement.txt" /> - </Component> - </Directory> </Directory> </Directory> <Directory Id="dir01544E63CCE21518F3D56A0A93D1DC4A" Name="models"> @@ -1444,12 +1412,6 @@ </Component> </Directory> <Directory Id="dir4ABFE5E33570C5CDD587CDA5FEC53CBC" Name="packs"> - <Component Id="cmpDEED3FE7C35E18D0FA59B8BB3DF42244" Guid="{5B8E1BED-1BC5-4A20-BA09-9699D0AF7BFC}"> - <File Id="fil43F38AE712D50BF0076D8C8E08E3264C" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\chiropteraDM.pk3" /> - </Component> - <Component Id="cmp98499D3076FA7324AFE1F9F8D10FB421" Guid="{38CA3EF3-96E4-47D1-8B4C-682BCCF91E99}"> - <File Id="fil98BCB56BE20EF36A4F72F07CDADC63DE" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\chiropteraDM.txt" /> - </Component> <Component Id="cmp532E67011B733ACE674692F6ED52775D" Guid="{9AC3FA7E-FBDC-4448-A61B-615EF43EB923}"> <File Id="filC6E116063CEC1DFBE1D6B452FD089931" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\cubemap.zip" /> </Component> @@ -1794,4 +1756,4 @@ </Directory> </DirectoryRef> </Fragment> -</Include> \ No newline at end of file +</Include> diff -Nur ogre.orig/CMake/Templates/demos.wxs.in ogre/CMake/Templates/demos.wxs.in --- ogre.orig/CMake/Templates/demos.wxs.in 2014-03-31 16:44:40.631560060 -0300 +++ ogre/CMake/Templates/demos.wxs.in 2014-03-31 16:59:50.921799622 -0300 @@ -39,7 +39,6 @@ <File Source='..\bin\release\samples.cfg' Vital='yes' /> <!-- Following config files are tweaked locally --> <File Source='.\resources.cfg' Vital='yes' /> - <File Source='.\quakemap.cfg' Vital='yes' /> <File Source="..\bin\release\SampleBrowser.exe" /> <File Source='..\bin\release\Sample_BezierPatch.dll' Vital='yes' /> diff -Nur ogre.orig/CMake/Templates/resources.cfg.in ogre/CMake/Templates/resources.cfg.in --- ogre.orig/CMake/Templates/resources.cfg.in 2014-03-31 16:44:40.641559915 -0300 +++ ogre/CMake/Templates/resources.cfg.in 2014-03-31 17:02:35.802761281 -0300 @@ -12,7 +12,6 @@ FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures -FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/nvidia FileSystem=@OGRE_MEDIA_DIR_REL@/models FileSystem=@OGRE_MEDIA_DIR_REL@/particle FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia diff -Nur ogre.orig/CMake/Templates/resources_d.cfg.in ogre/CMake/Templates/resources_d.cfg.in --- ogre.orig/CMake/Templates/resources_d.cfg.in 2014-03-31 16:44:40.644893200 -0300 +++ ogre/CMake/Templates/resources_d.cfg.in 2014-03-31 17:02:14.183072260 -0300 @@ -12,7 +12,6 @@ FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/programs FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/scripts FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/textures -FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/textures/nvidia FileSystem=@OGRE_MEDIA_DIR_DBG@/models FileSystem=@OGRE_MEDIA_DIR_DBG@/particle FileSystem=@OGRE_MEDIA_DIR_DBG@/DeferredShadingMedia diff -Nur ogre.orig/Samples/BSP/include/BSP.h ogre/Samples/BSP/include/BSP.h --- ogre.orig/Samples/BSP/include/BSP.h 2014-03-31 16:44:40.718225480 -0300 +++ ogre/Samples/BSP/include/BSP.h 2014-03-31 16:58:16.993150707 -0300 @@ -19,7 +19,6 @@ { mInfo["Title"] = "BSP"; mInfo["Description"] = "A demo of the indoor, or BSP (Binary Space Partition) scene manager. " - "Also demonstrates how to load BSP maps from Quake 3."; mInfo["Thumbnail"] = "thumb_bsp.png"; mInfo["Category"] = "Geometry"; } @@ -43,27 +42,6 @@ protected: - void locateResources() - { - // load the Quake archive location and map name from a config file - ConfigFile cf; - cf.load(mFSLayer->getConfigFilePath("quakemap.cfg")); - mArchive = cf.getSetting("Archive"); - mMap = cf.getSetting("Map"); - -#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS - // OS X does not set the working directory relative to the app, - // In order to make things portable on OS X we need to provide - // the loading with it's own bundle path location - if (!Ogre::StringUtil::startsWith(mArchive, "/", false)) // only adjust relative dirs - mArchive = Ogre::String(Ogre::macBundlePath() + "/" + mArchive); -#endif - - // add the Quake archive to the world resource group - ResourceGroupManager::getSingleton().addResourceLocation(mArchive, "Zip", - ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true); - } - void createSceneManager() { mSceneMgr = mRoot->createSceneManager("BspSceneManager"); // the BSP scene manager is required for this sample @@ -108,10 +86,6 @@ // set a random player starting point ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true); - // Quake uses the Z axis as the up axis, so make necessary adjustments - mCamera->setFixedYawAxis(true, Vector3::UNIT_Z); - mCamera->pitch(Degree(90)); - mCamera->setPosition(vp.position); mCamera->rotate(vp.orientation); diff -Nur ogre.orig/Samples/Browser/CMakeLists.txt ogre/Samples/Browser/CMakeLists.txt --- ogre.orig/Samples/Browser/CMakeLists.txt 2014-03-31 16:44:40.734891905 -0300 +++ ogre/Samples/Browser/CMakeLists.txt 2014-03-31 16:54:51.716103447 -0300 @@ -307,8 +307,6 @@ ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/samples.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ - COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/quakemap.cfg - ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Media ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ COMMAND ditto @@ -323,8 +321,6 @@ ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ - COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg - ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ COMMAND ditto diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj --- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-03-31 16:44:40.791557758 -0300 +++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-03-31 16:51:57.408610715 -0300 @@ -555,48 +555,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> </None> - <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - </None> - <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - </None> - <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - </None> - <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - </None> - <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - </None> - <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - </None> <None Include="..\..\Media\materials\textures\ogreborder.png"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> @@ -3671,15 +3629,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> </None> - <None Include="..\..\Media\packs\chiropteraDM.pk3"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - </None> <None Include="..\..\Media\packs\cubemap.zip"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent> @@ -4867,20 +4816,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> </None> - <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - </None> - <None Include="..\..\Media\packs\chiropteraDM.txt"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - </None> <None Include="..\..\Media\RTShaderLib\cache\dummy.txt"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> @@ -4893,4 +4828,4 @@ <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters --- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-03-31 16:44:40.808224186 -0300 +++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-03-31 16:51:57.411944001 -0300 @@ -628,9 +628,6 @@ <None Include="..\..\Media\models\Barrel.mesh"> <Filter>Assets\media</Filter> </None> - <None Include="..\..\Media\packs\chiropteraDM.pk3"> - <Filter>Assets\media</Filter> - </None> <None Include="..\..\Media\models\column.mesh"> <Filter>Assets\media</Filter> </None> @@ -1075,9 +1072,6 @@ <None Include="..\..\Media\materials\textures\checker.png"> <Filter>Assets\media</Filter> </None> - <None Include="..\..\Media\packs\chiropteraDM.txt"> - <Filter>Assets\media</Filter> - </None> <None Include="..\..\Media\materials\textures\Chrome.jpg"> <Filter>Assets\media</Filter> </None> @@ -1105,12 +1099,6 @@ <None Include="..\..\Media\materials\textures\dirt01.jpg"> <Filter>Assets\media</Filter> </None> - <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds"> - <Filter>Assets\media</Filter> - </None> - <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds"> - <Filter>Assets\media</Filter> - </None> <None Include="..\..\Media\materials\textures\dkyellow.png"> <Filter>Assets\media</Filter> </None> @@ -1168,24 +1156,12 @@ <None Include="..\..\Media\materials\textures\grass_1024.jpg"> <Filter>Assets\media</Filter> </None> - <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds"> - <Filter>Assets\media</Filter> - </None> - <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds"> - <Filter>Assets\media</Filter> - </None> <None Include="..\..\Media\materials\textures\SSAO\gray256.png"> <Filter>Assets\media</Filter> </None> <None Include="..\..\Media\materials\textures\GreenSkin.jpg"> <Filter>Assets\media</Filter> </None> - <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds"> - <Filter>Assets\media</Filter> - </None> - <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds"> - <Filter>Assets\media</Filter> - </None> <None Include="..\..\Media\materials\programs\HLSL\hdr.hlsl"> <Filter>Assets\media</Filter> </None> @@ -1492,9 +1468,6 @@ <None Include="..\..\Media\materials\textures\TextureAtlasSampleWrap0.png"> <Filter>Assets\media</Filter> </None> - <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt"> - <Filter>Assets\media</Filter> - </None> <None Include="..\..\Media\thumbnails\thumb_bezier.png"> <Filter>Assets\media</Filter> </None> @@ -1658,4 +1631,4 @@ <Filter>Assets\media</Filter> </None> </ItemGroup> -</Project> \ No newline at end of file +</Project> diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj --- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-03-31 16:44:40.821557325 -0300 +++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-03-31 16:51:57.415277288 -0300 @@ -4356,21 +4356,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> </None> - <None Include="..\..\Media\packs\chiropteraDM.pk3"> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> - </None> <None Include="..\..\Media\packs\cubemap.zip"> <DeploymentContent>true</DeploymentContent> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> @@ -6443,96 +6428,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> </None> - <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> - </None> - <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> - </None> - <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> - </None> - <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> - </None> - <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> - </None> - <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> - </None> <None Include="..\..\Media\materials\textures\ogreborder.png"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild> @@ -9014,36 +8909,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> </None> - <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> - </None> - <None Include="..\..\Media\packs\chiropteraDM.txt"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|Win32'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|x64'">false</ExcludedFromBuild> - <DeploymentContent>true</DeploymentContent> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild> - </None> <None Include="..\..\Media\RTShaderLib\cache\dummy.txt"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug with shader compiler|Win32'">false</ExcludedFromBuild> @@ -9264,4 +9129,4 @@ <Import Condition="'$(Configuration)'=='Phone Debug' or '$(Configuration)'=='Phone Release'" Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters --- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-03-31 16:44:40.918222604 -0300 +++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-03-31 16:51:57.415277288 -0300 @@ -731,9 +731,6 @@ <None Include="..\..\Media\models\Barrel.mesh"> <Filter>Assets\media</Filter> </None> - <None Include="..\..\Media\packs\chiropteraDM.pk3"> - <Filter>Assets\media</Filter> - </None> <None Include="..\..\Media\models\column.mesh"> <Filter>Assets\media</Filter> </None> @@ -1154,9 +1151,6 @@ <None Include="..\..\Media\materials\textures\checker.png"> <Filter>Assets\media</Filter> </None> - <None Include="..\..\Media\packs\chiropteraDM.txt"> - <Filter>Assets\media</Filter> - </None> <None Include="..\..\Media\materials\textures\Chrome.jpg"> <Filter>Assets\media</Filter> </None> @@ -1184,12 +1178,6 @@ <None Include="..\..\Media\materials\textures\dirt01.jpg"> <Filter>Assets\media</Filter> </None> - <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds"> - <Filter>Assets\media</Filter> - </None> - <None Include="..\..\Media\materials\textures\nvidia\dirt_grayrocky_normalheight.dds"> - <Filter>Assets\media</Filter> - </None> <None Include="..\..\Media\materials\textures\dkyellow.png"> <Filter>Assets\media</Filter> </None> @@ -1247,24 +1235,12 @@ <None Include="..\..\Media\materials\textures\grass_1024.jpg"> <Filter>Assets\media</Filter> </None> - <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_diffusespecular.dds"> - <Filter>Assets\media</Filter> - </None> - <None Include="..\..\Media\materials\textures\nvidia\grass_green-01_normalheight.dds"> - <Filter>Assets\media</Filter> - </None> <None Include="..\..\Media\materials\textures\SSAO\gray256.png"> <Filter>Assets\media</Filter> </None> <None Include="..\..\Media\materials\textures\GreenSkin.jpg"> <Filter>Assets\media</Filter> </None> - <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds"> - <Filter>Assets\media</Filter> - </None> - <None Include="..\..\Media\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds"> - <Filter>Assets\media</Filter> - </None> <None Include="..\..\Media\materials\programs\HLSL\hdr.hlsl"> <Filter>Assets\media</Filter> </None> @@ -1571,9 +1547,6 @@ <None Include="..\..\Media\materials\textures\TextureAtlasSampleWrap0.png"> <Filter>Assets\media</Filter> </None> - <None Include="..\..\Media\materials\textures\nvidia\TextureUsageAgreement.txt"> - <Filter>Assets\media</Filter> - </None> <None Include="..\..\Media\thumbnails\thumb_bezier.png"> <Filter>Assets\media</Filter> </None> @@ -1775,4 +1748,4 @@ <Filter>Assets\for WMAppManifest</Filter> </Image> </ItemGroup> -</Project> \ No newline at end of file +</Project> diff -Nur ogre.orig/Samples/Browser/WinRT.Xaml/resources.cfg ogre/Samples/Browser/WinRT.Xaml/resources.cfg --- ogre.orig/Samples/Browser/WinRT.Xaml/resources.cfg 2014-03-31 16:44:40.771558046 -0300 +++ ogre/Samples/Browser/WinRT.Xaml/resources.cfg 2014-03-31 17:00:55.510870562 -0300 @@ -11,7 +11,6 @@ FileSystem=media/materials/programs FileSystem=media/materials/scripts FileSystem=media/materials/textures -FileSystem=media/materials/textures/nvidia FileSystem=media/models FileSystem=media/particle FileSystem=media/DeferredShadingMedia diff -Nur ogre.orig/Samples/Browser/WinRT.Xaml/resources_d.cfg ogre/Samples/Browser/WinRT.Xaml/resources_d.cfg --- ogre.orig/Samples/Browser/WinRT.Xaml/resources_d.cfg 2014-03-31 16:44:40.771558046 -0300 +++ ogre/Samples/Browser/WinRT.Xaml/resources_d.cfg 2014-03-31 17:01:16.207239528 -0300 @@ -11,7 +11,6 @@ FileSystem=media/materials/programs FileSystem=media/materials/scripts FileSystem=media/materials/textures -FileSystem=media/materials/textures/nvidia FileSystem=media/models FileSystem=media/particle FileSystem=media/DeferredShadingMedia diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt --- ogre.orig/Samples/CMakeLists.txt 2014-03-31 16:44:40.941555601 -0300 +++ ogre/Samples/CMakeLists.txt 2014-03-31 16:51:57.415277288 -0300 @@ -238,7 +238,6 @@ set(OGRE_MEDIA_DIR_TMP ${OGRE_MEDIA_DIR_REL}) set(OGRE_MEDIA_DIR_REL "Media") configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg @ONLY) - configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg @ONLY) # restore set(OGRE_MEDIA_DIR_REL ${OGRE_MEDIA_DIR_TMP}) add_custom_target(demo_installer diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/EndlessWorld/include/EndlessWorld.h --- ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h 2014-03-31 16:44:41.174885577 -0300 +++ ogre/Samples/EndlessWorld/include/EndlessWorld.h 2014-03-31 16:51:57.415277288 -0300 @@ -307,17 +307,6 @@ defaultimp.inputScale = 600; defaultimp.minBatchSize = 33; defaultimp.maxBatchSize = 65; - // textures - defaultimp.layerList.resize(3); - defaultimp.layerList[0].worldSize = 100; - defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); - defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); - defaultimp.layerList[1].worldSize = 30; - defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); - defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); - defaultimp.layerList[2].worldSize = 200; - defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); - defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); } /*----------------------------------------------------------------------------- diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre/Samples/Media/volumeTerrain/triplanarReference.material --- ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material 2014-03-31 16:44:41.678211671 -0300 +++ ogre/Samples/Media/volumeTerrain/triplanarReference.material 2014-03-31 16:51:57.415277288 -0300 @@ -11,36 +11,6 @@ fragment_program_ref TriplanarReferenceHigh_PS { } - texture_unit - { - texture_alias fromX - texture dirt_grayrocky_diffusespecular.dds - } - texture_unit - { - texture_alias fromXNormal - texture dirt_grayrocky_normalheight.dds - } - texture_unit - { - texture_alias fromY - texture grass_green-01_diffusespecular.dds - } - texture_unit - { - texture_alias fromYNormal - texture grass_green-01_normalheight.dds - } - texture_unit - { - texture_alias fromZ - texture growth_weirdfungus-03_diffusespecular.dds - } - texture_unit - { - texture_alias fromZNormal - texture growth_weirdfungus-03_normalheight.dds - } } } } @@ -57,36 +27,6 @@ fragment_program_ref TriplanarReferenceLow_PS { } - texture_unit - { - texture_alias fromX - texture dirt_grayrocky_diffusespecular.dds - } - texture_unit - { - texture_alias fromXNormal - texture dirt_grayrocky_normalheight.dds - } - texture_unit - { - texture_alias fromY - texture grass_green-01_diffusespecular.dds - } - texture_unit - { - texture_alias fromYNormal - texture grass_green-01_normalheight.dds - } - texture_unit - { - texture_alias fromZ - texture growth_weirdfungus-03_diffusespecular.dds - } - texture_unit - { - texture_alias fromZNormal - texture growth_weirdfungus-03_normalheight.dds - } } } } @@ -101,4 +41,4 @@ diffuse 1.0 1.0 1.0 } } -} \ No newline at end of file +} diff -Nur ogre.orig/Samples/Terrain/include/Terrain.h ogre/Samples/Terrain/include/Terrain.h --- ogre.orig/Samples/Terrain/include/Terrain.h 2014-03-31 16:44:42.381534889 -0300 +++ ogre/Samples/Terrain/include/Terrain.h 2014-03-31 16:51:57.415277288 -0300 @@ -534,17 +534,6 @@ defaultimp.inputScale = 600; defaultimp.minBatchSize = 33; defaultimp.maxBatchSize = 65; - // textures - defaultimp.layerList.resize(3); - defaultimp.layerList[0].worldSize = 100; - defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); - defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); - defaultimp.layerList[1].worldSize = 30; - defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); - defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); - defaultimp.layerList[2].worldSize = 200; - defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); - defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); } diff -Nur ogre.orig/Tests/CMakeLists.txt ogre/Tests/CMakeLists.txt --- ogre.orig/Tests/CMakeLists.txt 2014-03-31 16:44:42.431534168 -0300 +++ ogre/Tests/CMakeLists.txt 2014-03-31 16:55:11.432486511 -0300 @@ -78,8 +78,6 @@ ${OGRE_TEST_CONTENTS_PATH}/Resources/ COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg ${OGRE_TEST_CONTENTS_PATH}/Resources/ - COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg - ${OGRE_TEST_CONTENTS_PATH}/Resources/ COMMAND ditto ${OGRE_SOURCE_DIR}/Samples/Media/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/ COMMAND ditto diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen.cpp --- ogre.orig/Tests/PlayPen/src/PlayPen.cpp 2014-03-31 16:44:42.661530860 -0300 +++ ogre/Tests/PlayPen/src/PlayPen.cpp 2014-03-31 16:51:57.418610574 -0300 @@ -411,16 +411,6 @@ // mTerrain->update(); // updateDelay = 0.3; // } -// /* -// if (mKeyboard->isKeyDown(OIS::KC_M) && updateDelay <= 0) -// { -// StringVector texNames; -// texNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); -// texNames.push_back("growth_weirdfungus-03_normalheight.dds"); -// mTerrain->addLayer(500, &texNames); -// updateDelay = 0.3; -// } -// */ // updateDelay -= evt.timeSinceLastFrame; // } //#endif @@ -8185,17 +8175,6 @@ // imp.inputScale = 600; // imp.minBatchSize = 33; // imp.maxBatchSize = 65; -// // textures -// imp.layerList.resize(3); -// imp.layerList[0].worldSize = 100; -// imp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); -// imp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); -// imp.layerList[1].worldSize = 30; -// imp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); -// imp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); -// imp.layerList[2].worldSize = 200; -// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); -// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); // terrain->prepare(imp); // terrain->load(); // diff -Nur ogre.orig/Tests/VisualTests/Context/CMakeLists.txt ogre/Tests/VisualTests/Context/CMakeLists.txt --- ogre.orig/Tests/VisualTests/Context/CMakeLists.txt 2014-03-31 16:44:42.681530572 -0300 +++ ogre/Tests/VisualTests/Context/CMakeLists.txt 2014-03-31 16:55:35.265477026 -0300 @@ -137,8 +137,6 @@ ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ - COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg - ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/tests.cfg ${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/ COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media diff -Nur ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp ogre/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp --- ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp 2014-03-31 16:44:42.711530141 -0300 +++ ogre/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp 2014-03-31 16:56:35.361279265 -0300 @@ -2018,47 +2018,6 @@ addScreenshotFrame(10); } //---------------------------------------------------------------------------- - -void PlayPen_Bsp::setupContent() -{ - // Load Quake3 locations from a file - ConfigFile cf; - - cf.load(mFSLayer->getConfigFilePath("quakemap.cfg")); - - String quakePk3 = cf.getSetting("Archive"); - String quakeLevel = cf.getSetting("Map"); - - //ResourceGroupManager::getSingleton().addResourceLocation(quakePk3, "Zip"); - - ResourceGroupManager::getSingleton().addResourceLocation( - quakePk3, "Zip", - ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true); - - // Load world geometry - //mSceneMgr->setWorldGeometry(quakeLevel); - - ResourceGroupManager& rgm = ResourceGroupManager::getSingleton(); - rgm.linkWorldGeometryToResourceGroup(rgm.getWorldResourceGroupName(), quakeLevel, mSceneMgr); - rgm.initialiseResourceGroup(rgm.getWorldResourceGroupName()); - rgm.loadResourceGroup(rgm.getWorldResourceGroupName(), false); - - // modify camera for close work - mCamera->setNearClipDistance(4); - mCamera->setFarClipDistance(4000); - - // Also change position, and set Quake-type orientation - // Get random player start point - ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true); - mCamera->setPosition(vp.position); - mCamera->pitch(Degree(90)); // Quake uses X/Y horizon, Z up - mCamera->rotate(vp.orientation); - // Don't yaw along variable axis, causes leaning - mCamera->setFixedYawAxis(true, Vector3::UNIT_Z); - - mCamera->yaw(Ogre::Degree(-90.f)); -} -//---------------------------------------------------------------------------- //---------------------------------------------------------------------------- PlayPen_BuildTangentOnAnimatedMesh::PlayPen_BuildTangentOnAnimatedMesh()