From b2ebeb570a4b308b3a32b0819ec0ef1086066f4a Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Mon, 3 Jul 2017 18:44:04 -0500 Subject: ogre-1.10.5-1.parabola1: updating version --- libre/ogre/PKGBUILD | 143 ++----- libre/ogre/libre.patch | 1032 +++++++++++++++--------------------------------- 2 files changed, 352 insertions(+), 823 deletions(-) diff --git a/libre/ogre/PKGBUILD b/libre/ogre/PKGBUILD index 62acfcabb..2ad28251b 100644 --- a/libre/ogre/PKGBUILD +++ b/libre/ogre/PKGBUILD @@ -1,96 +1,49 @@ -# Maintainer: Márcio Silva - -_bldname=blender -_bldver=2.69 -_bldep=10 - -# ($srcdir/Tools/${_bldname^}2.6Export/__init__.py:bl_info>version) -_addver=2.0.3 -_addrel=1 +# Maintainer (Arch): Sven-Hendrik Haase +# Contributor (Hyperbola): Márcio Silva +# Maintainer: Omar Vega Ramos pkgbase=ogre -pkgname=( - $pkgbase - #$_bldname-addon-$pkgbase # package unstable -) -pkgver=1.9.0 -pkgrel=16.parabola1 +pkgname=('ogre') +pkgver=1.10.5 +pkgrel=1.parabola1 pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files' -arch=( - x86_64 - i686 - armv7h -) -url=http://www.${pkgbase}3d.org -license=( - MIT -) -depends=( - boost-libs - freeimage - freetype2 - glu - libxaw - libxrandr - ois - tinyxml - zziplib -) -makedepends=( - boost - cmake - doxygen - graphviz - mesa - mercurial - ttf-dejavu -) -mksource=( - ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-} -) -source=( - https://repo.parabola.nu/other/$pkgbase-libre/$pkgbase-libre-$pkgver.tar.xz - ogre-template-fix.patch::https://bitbucket.org/sinbad/ogre/commits/a24ac4afbbb9dc5ff49a61634af50da11ba8fb97/raw/ - ogre-cmake30.patch::https://bitbucket.org/sinbad/ogre/commits/d84bce645d3dd439188d3d29d8da51c51765a085/raw/ - libre.patch -) -mksha512sums=( - SKIP -) -sha512sums=( - 13e743d65affd6813f6e3c6064d543bfe2d013a8d44bec203dc819859618114f0e5c7f5e67a98250d0174497dd58a9238956e04ac9f7925695ab6ebda555c412 - 8188083e88fef6c9ed2df9058204ecb5384c1fac530570323aa5becbec93e7f2f9ff624a6568df845abd9ea1a01195b710d8b48e3074a2aa8101415bce873b72 - 1130544e532d77d7fe31dbd09fe7980716e2497a309c35fa12663450838be393bdf329696d4411e5644e03e328cd8772fb9becb7be5f6a87bd54c296d90b75b7 - 5480c08c6faf48c1aabde1efd9508165c2fbea78f19d58c6360ea310c223d1979a7d7eaa15c9a70c8c3b3e7f89877c6f47e7fe16638ae77c463d55e87a5a3316 -) +arch=('i686' 'x86_64' 'armv7h') +url='http://www.ogre3d.org' +license=('custom:MIT') +depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr' + 'zziplib' 'sdl2' 'glu' 'tinyxml') +makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'mercurial' 'python' 'swig') +mksource=(ogre-$pkgver::hg+http://bitbucket.org/sinbad/ogre#tag=v${pkgver//./-}) +source=(https://repo.parabola.nu/other/$pkgbase-libre/$pkgbase-libre-$pkgver.tar.xz + libre.patch) +mksha512sums=('SKIP') +sha512sums=('c6effe71e3251617e38f6834dd6ef610b06bde037405a30640a7161748428646edba63c4861e79620cdc976b43325a9520cb3a43a0fa3f311130b9b9a0c2422d' + '9a09a04f2a3f7d79bf86c44cb25881a7ea2b3fc78706aeb2df293016ddbefc33414b3811502c1912d4f28f86fc52caf05537133e36f414af85b8d5b3a4916026') mksource() { cd ${pkgbase} # remove nonfree files - rm -v RenderSystems/GL/include/GL/{gl{,ext},wglext,glx{tokens,ext}}.h - rm -v RenderSystems/GL3Plus/include/GL/glxtokens-backup.h +# rm -v RenderSystems/GL/include/GL/{gl{,ext},wglext,glx{tokens,ext}}.h + rm -v RenderSystems/GL/include/GL/gl.h rm -rv Samples/Media/materials/textures/nvidia rm -v Samples/Media/packs/chiropteraDM.{pk3,txt} - rm -v CMake/Templates/quakemap{,_d}.cfg.in } prepare() { cd ${pkgbase} - patch -Np1 < $srcdir/ogre-template-fix.patch - patch -Np1 < $srcdir/ogre-cmake30.patch - # remove nonfree references + rm -v CMake/Templates/quakemap.cfg.in patch -Np1 -i $srcdir/libre.patch # add symlinks to point to mesa header files - cd RenderSystems/GL/include/GL - ln -sv /usr/include/GL/gl.h gl.h - ln -sv /usr/include/GL/glext.h glext.h - ln -sv /usr/include/GL/wglext.h wglext.h - ln -sv /usr/include/GL/glxtokens.h glxtokens.h - ln -sv /usr/include/GL/glxext.h glxext.h +# cd RenderSystems/GL/include/GL +# ln -sv /usr/include/GL/gl.h gl.h +# ln -sv /usr/include/GL/glext.h glext.h +# ln -sv /usr/include/GL/wglext.h wglext.h +# ln -sv /usr/include/GL/glxtokens.h glxtokens.h +# ln -sv /usr/include/GL/glxext.h glxext.h } build() { @@ -100,9 +53,6 @@ build() { [[ -d build ]] && rm -vrf build mkdir -v build && cd build - # Silence warnings about deprecated declarations - CXXFLAGS+=' -Wno-deprecated-declarations' - # SAMPLES, SAMPLES_SOURCE and TESTS are nonfree cmake .. \ -DCMAKE_BUILD_TYPE=Release\ @@ -110,14 +60,16 @@ build() { -DCPACK_PACKAGE_DESCRIPTION_SUMMARY='Libre 3D Graphics Engine'\ -D${pkgbase^^}_BUILD_COMPONENT_PAGING=TRUE\ -D${pkgbase^^}_BUILD_COMPONENT_PROPERTY=TRUE\ + -D${pkgbase^^}_BUILD_COMPONENT_PYTHON=TRUE \ -D${pkgbase^^}_BUILD_COMPONENT_RTSHADERSYSTEM=TRUE\ -D${pkgbase^^}_BUILD_COMPONENT_TERRAIN=TRUE\ + -D${pkgbase^^}_BUILD_DEPENDENCIES=FALSE \ -D${pkgbase^^}_BUILD_PLATFORM_NACL=FALSE\ -D${pkgbase^^}_BUILD_PLUGIN_BSP=TRUE\ -D${pkgbase^^}_BUILD_PLUGIN_OCTREE=TRUE\ -D${pkgbase^^}_BUILD_PLUGIN_PCZ=TRUE\ -D${pkgbase^^}_BUILD_PLUGIN_PFX=TRUE\ - -D${pkgbase^^}_BUILD_RENDERSYSTEM_GL=TRUE\ + -D${pkgbase^^}_BUILD_RENDERSYSTEM_GL=FALSE\ -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES=FALSE\ -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES2=FALSE\ -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_CORE_SHADERS=TRUE\ @@ -145,39 +97,24 @@ build() { } package_ogre() { - optdepends=( - "boost: for developing using $pkgbase" - "$pkgbase-docs: documentation" - ) + optdepends=('cppunit: unit testing' + 'intel-tbb: better threading support' + 'poco: portability' + 'python: python bindings' + 'boost: for developing using ogre' + 'ogre-docs: documentation') conflicts=(${pkgbase}-libre) replaces=(${pkgbase}-libre) - cd ${pkgbase}/build + cd ogre/build make DESTDIR=$pkgdir install # install license - install -vDm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html + install -vDm644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING - # remove files only useful for nonfree software - rm -vr $pkgdir/usr/lib/OGRE/cmake - rm -v $pkgdir/usr/include/OGRE/Example*.h -} - -package_blender-addon-ogre() { - pkgdesc="${pkgbase^} Mesh Exporter: A addon for the ${_bldname^} which allows export mesh and (skeletal/morph/pose) animations to ${pkgbase^}3D format (built for the $_bldname package)" - arch=any - depends=( - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" - ) - _pkgver=$pkgver - pkgver=$_addver.v$_bldver - pkgrel=$_addrel - - cd ${pkgbase} - a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons - install -vd $a && cp -va Tools/${_bldname^}2.6Export $a/$pkgbase + # move docs out of this package + mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs } # vim:set ts=2 sw=2 et: diff --git a/libre/ogre/libre.patch b/libre/ogre/libre.patch index e9a1846b1..ca6226bb1 100644 --- a/libre/ogre/libre.patch +++ b/libre/ogre/libre.patch @@ -1,17 +1,18 @@ -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 @@ +diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake +index dece16d..19f5ccd 100644 +--- a/CMake/InstallResources.cmake ++++ b/CMake/InstallResources.cmake +@@ -118,9 +118,6 @@ configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${OGRE_BINARY_DIR}/inst/bi # 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/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 @@ +@@ -135,7 +132,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE) ${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 @@ -19,7 +20,7 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cma DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug ) install(FILES -@@ -141,7 +137,6 @@ +@@ -143,7 +139,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE) ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg @@ -27,7 +28,7 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cma DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None "" ) install(FILES -@@ -149,7 +144,6 @@ +@@ -151,7 +146,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE) ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg @@ -35,7 +36,7 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cma DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo ) install(FILES -@@ -157,7 +151,6 @@ +@@ -159,7 +153,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE) ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg @@ -43,7 +44,7 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cma DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel ) -@@ -168,7 +161,6 @@ +@@ -170,7 +163,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE) ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg @@ -51,42 +52,44 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cma DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" ) endif() -@@ -219,11 +211,6 @@ +@@ -224,11 +216,6 @@ elseif (MSVC AND NOT NMAKE) 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/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) +@@ -248,8 +235,6 @@ else() # other OS only need one cfg file + configure_file(${OGRE_TEMPLATES_DIR}/resources.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) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.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 +diff --git a/CMake/Templates/Android_resources.cfg.in b/CMake/Templates/Android_resources.cfg.in +index 6e0e428..b87453d 100644 +--- a/CMake/Templates/Android_resources.cfg.in ++++ b/CMake/Templates/Android_resources.cfg.in +@@ -13,7 +13,6 @@ APKFileSystem=/fonts + APKFileSystem=/materials/programs 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 @@ + APKFileSystem=/materials/scripts/SSAO +diff --git a/CMake/Templates/SDK_CMakeLists.txt.in b/CMake/Templates/SDK_CMakeLists.txt.in +index 700ecc4..8db2327 100644 +--- a/CMake/Templates/SDK_CMakeLists.txt.in ++++ b/CMake/Templates/SDK_CMakeLists.txt.in +@@ -244,7 +244,6 @@ if (UNIX AND NOT APPLE) 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) @@ -94,9 +97,10 @@ diff -Nur ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in ogre/CMake/Templates/S 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 +diff --git a/CMake/Templates/demomedia.wxi.in b/CMake/Templates/demomedia.wxi.in +index 8535c75..ee09b0c 100644 +--- a/CMake/Templates/demomedia.wxi.in ++++ b/CMake/Templates/demomedia.wxi.in @@ -295,13 +295,6 @@ @@ -170,9 +174,10 @@ diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demome - \ No newline at end of file + -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 +diff --git a/CMake/Templates/demos.wxs.in b/CMake/Templates/demos.wxs.in +index a9eb6e3..30b9c19 100644 +--- a/CMake/Templates/demos.wxs.in ++++ b/CMake/Templates/demos.wxs.in @@ -39,7 +39,6 @@ @@ -181,10 +186,11 @@ diff -Nur ogre.orig/CMake/Templates/demos.wxs.in ogre/CMake/Templates/demos.wxs. -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 @@ +diff --git a/CMake/Templates/resources.cfg.in b/CMake/Templates/resources.cfg.in +index 900ae05..242873c 100644 +--- a/CMake/Templates/resources.cfg.in ++++ b/CMake/Templates/resources.cfg.in +@@ -14,7 +14,6 @@ FileSystem=@OGRE_MEDIA_DIR_REL@/fonts FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures @@ -192,532 +198,221 @@ diff -Nur ogre.orig/CMake/Templates/resources.cfg.in ogre/CMake/Templates/resour 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 @@ +diff --git a/Docs/License.md b/Docs/License.md +index 4bfddde..d62cf4d 100644 +--- a/Docs/License.md ++++ b/Docs/License.md +@@ -298,36 +298,6 @@ included in the Docs/licenses folder.
+ + +
+- +-NVidia Cg
+- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-
Original Authors:NVidia
Website:http://developer.nvidia.com
Licensed Under:Custom free license (binary only)
Needed By:Plugin_CgProgramManager
+-
+ OpenEXR
+ + +@@ -408,57 +378,4 @@ thus you do not need to use them to use OGRE, if you don't want to.
+ + + +-

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.

    +-
    • +-
  • SoftImage|XSI sample media files (facial.mesh, jaiqua.mesh and associated files) are provided courtesy of Avid Technology, Inc.
    +- © 2004 Avid Technology, Inc. All rights +- reserved. Avid is either a registered trademark or trademark of Avid +- Technology, Inc. in the United States and/or other countries. +-
    • +-
  • +-

    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: + 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"); +- 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 = Ogre::String(Ogre::macBundlePath() + "/" + mArchive); +- 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 -@@ -108,10 +86,6 @@ - // set a random player starting point - ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true); +- // 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 -- mCamera->setFixedYawAxis(true, Vector3::UNIT_Z); -- mCamera->pitch(Degree(90)); +- // Quake uses the Z axis as the up axis, so make necessary adjustments +- mCameraNode->setFixedYawAxis(true, Vector3::UNIT_Z); +- mCameraNode->pitch(Degree(90)); - - mCamera->setPosition(vp.position); - mCamera->rotate(vp.orientation); + mCameraNode->setPosition(vp.position); + mCameraNode->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 @@ - 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-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 @@ - - 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-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 @@ - 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-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 @@ - - 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/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 @@ +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) @@ -725,10 +420,11 @@ diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt # 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 @@ +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; @@ -746,165 +442,60 @@ diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/End } /*----------------------------------------------------------------------------- -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 +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 } -- 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 -- } - } +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"); } - } -@@ -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 @@ + 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/ @@ -913,10 +504,11 @@ diff -Nur ogre.orig/Tests/VisualTests/Context/CMakeLists.txt ogre/Tests/VisualTe 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 @@ +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); } //---------------------------------------------------------------------------- @@ -925,18 +517,18 @@ diff -Nur ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp ogre/Tests/Vi -{ - // 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); - @@ -944,21 +536,21 @@ diff -Nur ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp ogre/Tests/Vi - 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); +- 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 -- mCamera->setFixedYawAxis(true, Vector3::UNIT_Z); +- mCameraNode->setFixedYawAxis(true, Vector3::UNIT_Z); - -- mCamera->yaw(Ogre::Degree(-90.f)); +- mCameraNode->yaw(Ogre::Degree(-90.f)); -} -//---------------------------------------------------------------------------- //---------------------------------------------------------------------------- -- cgit v1.2.3