diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake
--- ogre.orig/CMake/InstallResources.cmake 2014-01-15 01:56:25.549401653 -0200
+++ ogre/CMake/InstallResources.cmake 2014-01-21 21:24:52.510763877 -0200
@@ -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)
@@ -219,11 +216,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)
diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demomedia.wxi.in
--- ogre.orig/CMake/Templates/demomedia.wxi.in 2014-01-15 01:56:25.652728172 -0200
+++ ogre/CMake/Templates/demomedia.wxi.in 2014-01-21 21:49:24.962291640 -0200
@@ -295,13 +295,6 @@
-
-
-
-
-
-
-
@@ -328,8 +321,6 @@
-
-
@@ -1338,29 +1329,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1444,12 +1412,6 @@
-
-
-
-
-
-
@@ -1794,4 +1756,4 @@
-
\ No newline at end of file
+
diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj
--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-15 01:56:25.872713663 -0200
+++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj 2014-01-21 22:20:00.343185180 -0200
@@ -555,48 +555,6 @@
false
false
-
- false
- false
- true
- false
- false
-
-
- false
- false
- true
- false
- false
-
-
- false
- false
- true
- false
- false
-
-
- false
- false
- true
- false
- false
-
-
- false
- false
- true
- false
- false
-
-
- false
- false
- true
- false
- false
-
false
false
@@ -3671,15 +3629,6 @@
false
false
-
- false
- true
- false
- true
- true
- false
- false
-
false
true
@@ -4867,20 +4816,6 @@
false
false
-
- false
- false
- true
- false
- false
-
-
- false
- false
- true
- false
- false
-
false
false
@@ -4893,4 +4828,4 @@
-
\ No newline at end of file
+
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-01-15 01:56:25.872713663 -0200
+++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters 2014-01-21 22:20:41.517291770 -0200
@@ -628,9 +628,6 @@
Assets\media
-
- Assets\media
-
Assets\media
@@ -1075,9 +1072,6 @@
Assets\media
-
- Assets\media
-
Assets\media
@@ -1105,12 +1099,6 @@
Assets\media
-
- Assets\media
-
-
- Assets\media
-
Assets\media
@@ -1168,24 +1156,12 @@
Assets\media
-
- Assets\media
-
-
- Assets\media
-
Assets\media
Assets\media
-
- Assets\media
-
-
- Assets\media
-
Assets\media
@@ -1492,9 +1468,6 @@
Assets\media
-
- Assets\media
-
Assets\media
@@ -1658,4 +1631,4 @@
Assets\media
-
\ No newline at end of file
+
diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj
--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-15 01:56:25.896045457 -0200
+++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj 2014-01-21 21:53:56.997551091 -0200
@@ -4356,21 +4356,6 @@
false
false
-
- true
- false
- false
- false
- false
- false
- false
- false
- false
- false
- false
- false
- false
-
true
false
@@ -6443,96 +6428,6 @@
false
false
-
- false
- false
- false
- false
- false
- false
- false
- false
- true
- false
- false
- false
- false
-
-
- false
- false
- false
- false
- false
- false
- false
- false
- true
- false
- false
- false
- false
-
-
- false
- false
- false
- false
- false
- false
- false
- false
- true
- false
- false
- false
- false
-
-
- false
- false
- false
- false
- false
- false
- false
- false
- true
- false
- false
- false
- false
-
-
- false
- false
- false
- false
- false
- false
- false
- false
- true
- false
- false
- false
- false
-
-
- false
- false
- false
- false
- false
- false
- false
- false
- true
- false
- false
- false
- false
-
false
false
@@ -9014,36 +8909,6 @@
false
false
-
- false
- false
- false
- false
- false
- false
- false
- false
- true
- false
- false
- false
- false
-
-
- false
- false
- false
- false
- false
- false
- false
- false
- true
- false
- false
- false
- false
-
false
false
@@ -9264,4 +9129,4 @@
-
\ No newline at end of file
+
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-01-15 01:56:25.899378571 -0200
+++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters 2014-01-21 21:54:56.166945128 -0200
@@ -731,9 +731,6 @@
Assets\media
-
- Assets\media
-
Assets\media
@@ -1154,9 +1151,6 @@
Assets\media
-
- Assets\media
-
Assets\media
@@ -1184,12 +1178,6 @@
Assets\media
-
- Assets\media
-
-
- Assets\media
-
Assets\media
@@ -1247,24 +1235,12 @@
Assets\media
-
- Assets\media
-
-
- Assets\media
-
Assets\media
Assets\media
-
- Assets\media
-
-
- Assets\media
-
Assets\media
@@ -1571,9 +1547,6 @@
Assets\media
-
- Assets\media
-
Assets\media
@@ -1775,4 +1748,4 @@
Assets\for WMAppManifest
-
\ No newline at end of file
+
diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt
--- ogre.orig/Samples/CMakeLists.txt 2014-01-15 01:56:25.932709706 -0200
+++ ogre/Samples/CMakeLists.txt 2014-01-21 21:23:53.145016405 -0200
@@ -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-01-15 01:56:26.186026332 -0200
+++ ogre/Samples/EndlessWorld/include/EndlessWorld.h 2014-01-21 21:51:44.043058960 -0200
@@ -304,17 +304,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-01-15 01:56:27.849249967 -0200
+++ ogre/Samples/Media/volumeTerrain/triplanarReference.material 2014-01-21 22:24:19.433708607 -0200
@@ -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-01-15 01:56:28.209226225 -0200
+++ ogre/Samples/Terrain/include/Terrain.h 2014-01-21 21:55:51.099952029 -0200
@@ -533,17 +533,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/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen.cpp
--- ogre.orig/Tests/PlayPen/src/PlayPen.cpp 2014-01-15 01:56:28.309219629 -0200
+++ ogre/Tests/PlayPen/src/PlayPen.cpp 2014-01-21 22:31:02.415114645 -0200
@@ -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();
//