| Original Authors: | -NVidia | -
| Website: | -http://developer.nvidia.com | -
| Licensed Under: | -Custom free license (binary only) | -
| Needed By: | -Plugin_CgProgramManager | -
Art credits for demos
- -Matt Anderson at - www.The3dStudio.com who - kindly gave permission for the use of some textures. These textures are used with permission of - www.The3dStudio.com and may - not be re-distributed, sold, or given away except in the form of - rendered images, animations, or real time 3D applications when credit - is given to www.The3dStudio.com.
-Jonathan Clark at - http://www.jonathanclark.com - for some Golgotha textures thet were released to the public domain.
-The 'Raptor Assault Gunboat' mesh - & texture are © 2002 by Adrian 'cearny' Cearnau.
-The robot andn ninja mesh and - animation are by Psionic, - kindly made available from the CharacterFX - site
-The 'Razor 2' mesh is by Dennis - Verbeek
-Skyboxes in cubemapJS.zip are - ©Johannes Schlorb, used - with permission. -
-Grass texture is courtesy of Mathias 'freezer' Walc
-The 'Cuckoo' TrueType font is provided by http://www.grsites.com.
-The Sibenik Cathedral model by Marko Dabrovic - marko@3lhd.com.
-Copyright © 2013 by The OGRE Team
diff --git a/Samples/BSP/include/BSP.h b/Samples/BSP/include/BSP.h index 856dee0..5f47011 100644 --- a/Samples/BSP/include/BSP.h +++ b/Samples/BSP/include/BSP.h @@ -19,7 +19,6 @@ class _OgreSampleClassExport Sample_BSP : public SdkSample { 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"; } @@ -42,38 +41,6 @@ class _OgreSampleClassExport Sample_BSP : public SdkSample 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 - Ogre::String bundle = Ogre::macBundlePath(); -#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX - char* env_SNAP = getenv("SNAP"); - Ogre::String bundle(env_SNAP ? env_SNAP : ""); -#endif - -#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 = bundle + "/" + mArchive; -#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX - // With Ubuntu Snappy changes absolute paths are relative to the snap package. - if (Ogre::StringUtil::startsWith(mArchive, "/", false)) // only adjust absolute dirs - mArchive = bundle + 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 @@ -118,10 +85,6 @@ class _OgreSampleClassExport Sample_BSP : public SdkSample // set a random player starting point ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true); - // Quake uses the Z axis as the up axis, so make necessary adjustments - mCameraNode->setFixedYawAxis(true, Vector3::UNIT_Z); - mCameraNode->pitch(Degree(90)); - mCameraNode->setPosition(vp.position); mCameraNode->rotate(vp.orientation); diff --git a/Samples/Browser/CMakeLists.txt b/Samples/Browser/CMakeLists.txt index 007de53..bb75c19 100644 --- a/Samples/Browser/CMakeLists.txt +++ b/Samples/Browser/CMakeLists.txt @@ -118,13 +118,11 @@ if (WINDOWS_STORE OR WINDOWS_PHONE) ${OGRE_BINARY_DIR}/inst/bin/debug/resources_d.cfg ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg - ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_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/release/resources.cfg ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg - ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg @@ -149,14 +147,12 @@ if (WINDOWS_STORE OR WINDOWS_PHONE) set(DEBUG_CONTENT_FILES ${DEBUG_CONTENT_FILES} ${CMAKE_CURRENT_BINARY_DIR}/resources_d.cfg ${CMAKE_CURRENT_BINARY_DIR}/plugins_d.cfg - ${CMAKE_CURRENT_BINARY_DIR}/quakemap_d.cfg ${CMAKE_CURRENT_BINARY_DIR}/samples_d.cfg ${CMAKE_CURRENT_BINARY_DIR}/tests_d.cfg ) set(RELEASE_CONTENT_FILES ${RELEASE_CONTENT_FILES} ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg ${CMAKE_CURRENT_BINARY_DIR}/plugins.cfg - ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg ${CMAKE_CURRENT_BINARY_DIR}/samples.cfg ${CMAKE_CURRENT_BINARY_DIR}/tests.cfg ) @@ -330,7 +326,6 @@ if (APPLE) COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/plugins.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/resources.cfg ${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 ${OGRE_SOURCE_DIR}/Samples/Common/misc/SampleBrowser_OSX.icns ${OGRE_SAMPLE_CONTENTS_PATH}/Resources ) @@ -340,7 +335,6 @@ if (APPLE) COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/plugins.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/ COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg ${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 ${OGRE_SOURCE_DIR}/Samples/Common/misc/SampleBrowser_OSX.icns ${OGRE_SAMPLE_CONTENTS_PATH}/Resources ) diff --git a/Samples/CMakeLists.txt b/Samples/CMakeLists.txt index 65d6b5c..d742335 100644 --- a/Samples/CMakeLists.txt +++ b/Samples/CMakeLists.txt @@ -250,7 +250,6 @@ if (MSVC) 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 --git a/Samples/EndlessWorld/include/EndlessWorld.h b/Samples/EndlessWorld/include/EndlessWorld.h index 8f766ae..e7fc126 100644 --- a/Samples/EndlessWorld/include/EndlessWorld.h +++ b/Samples/EndlessWorld/include/EndlessWorld.h @@ -312,17 +312,6 @@ protected: 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 --git a/Samples/Media/volumeTerrain/triplanarReference.material b/Samples/Media/volumeTerrain/triplanarReference.material index 6b7c852..b5a42b6 100644 --- a/Samples/Media/volumeTerrain/triplanarReference.material +++ b/Samples/Media/volumeTerrain/triplanarReference.material @@ -9,9 +9,6 @@ material triplanarReference rtshader_system { lighting_stage ffp - // Texturescale, Plateau-size (0 to 0.57, not bigger to avoid division by zero!), transition-speed - // Texture from x, from y, from z - triplanarTexturing 0.1 0.2 2.0 dirt_grayrocky_diffusespecular.dds grass_green-01_diffusespecular.dds growth_weirdfungus-03_diffusespecular.dds } } } diff --git a/Samples/Terrain/include/Terrain.h b/Samples/Terrain/include/Terrain.h index 2db87cc..af97218 100644 --- a/Samples/Terrain/include/Terrain.h +++ b/Samples/Terrain/include/Terrain.h @@ -527,17 +527,6 @@ class _OgreSampleClassExport Sample_Terrain : public SdkSample 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"); } void addTextureDebugOverlay(TrayLocation loc, TexturePtr tex, size_t i) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index e85ec02..7c4adb5 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -198,8 +198,6 @@ if (OGRE_BUILD_TESTS) ${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 --git a/Tests/VisualTests/Context/CMakeLists.txt b/Tests/VisualTests/Context/CMakeLists.txt index b5e518a..476158e 100644 --- a/Tests/VisualTests/Context/CMakeLists.txt +++ b/Tests/VisualTests/Context/CMakeLists.txt @@ -140,8 +140,6 @@ if (APPLE) ${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 --git a/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp b/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp index b730721..4e485bd 100644 --- a/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp +++ b/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp @@ -2031,47 +2031,6 @@ PlayPen_Bsp::PlayPen_Bsp() 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); - mCameraNode->setPosition(vp.position); - mCameraNode->pitch(Degree(90)); // Quake uses X/Y horizon, Z up - mCameraNode->rotate(vp.orientation); - // Don't yaw along variable axis, causes leaning - mCameraNode->setFixedYawAxis(true, Vector3::UNIT_Z); - - mCameraNode->yaw(Ogre::Degree(-90.f)); -} -//---------------------------------------------------------------------------- //---------------------------------------------------------------------------- PlayPen_BuildTangentOnAnimatedMesh::PlayPen_BuildTangentOnAnimatedMesh()