Commits

Steve Streeting committed 765cad8

Changelog and version bump for 1.6.5
PlayPen updates

  • Participants
  • Parent commits 75f454d
  • Branches v1-6
  • Tags v1-6-5

Comments (0)

Files changed (12)

Docs/ChangeLog.html

 <p class="header" align="center">Change Log</p>
 
 <p class="mainheader">
+    v1.6.5 [Shoggoth] (27 December 2009) - Maintenance Release</p>
+ <ul>  
+ <li>If Mesh::buildTangentVectors is called and causes vertex splits, and mesh had pose animation, make sure we fix up the poses too.</li>
+ <li>Change 0 -> NULL in Dx9 Present() call, user reported issue on Intel G33/G31 GPU allegedly resolved by this (illogical, but does no harm)</li>
+ <li>Fix a crash when trying to render a line list with stencil shadows enabled</li>
+ <li>Deal with Dx9 device lost for hardware occlusion queries better</li>
+ <li>Fix problem in OpenGL when mixing anisotropy levels in different texture units on the same pass</li>
+ <li>Fix Win x64 RTC issues with timer</li>
+ <li>Fix bug in HLSL with 3x4 matrix arrays</li>
+ <li>Culling fixes for InstancedGeometry</li>
+ <li>Prevent GLX ConfigDialog from creating empty dropdown elements which cause a crash when clicked on.</li>
+ <li>Fix straggling texture unit state bug with multiple contexts in GL.</li>
+ <li>PF_L8 is not likely to be a valid render target format on many cards, use PF_X8R8G8B8 as is the default for non-depth shadows.</li>
+ <li>Documentation updates</li>
+ </ul>
+ 
+ <p class="mainheader">
     v1.6.4 [Shoggoth] (27 Sept 2009) - Maintenance Release</p>
  <ul>  
 	<li><b>DirectX:</b>

Mac/Ogre/include/config.h

 #define PACKAGE_NAME "OGRE"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "OGRE 1.6.4"
+#define PACKAGE_STRING "OGRE 1.6.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "ogre"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.6.4"
+#define PACKAGE_VERSION "1.6.5"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.6.4"
+#define VERSION "1.6.5"

OgreMain/include/OgrePrerequisites.h

     // Define ogre version
     #define OGRE_VERSION_MAJOR 1
     #define OGRE_VERSION_MINOR 6
-    #define OGRE_VERSION_PATCH 4
+    #define OGRE_VERSION_PATCH 5
 	#define OGRE_VERSION_SUFFIX ""
     #define OGRE_VERSION_NAME "Shoggoth"
 

SDK/OSX/make_osx.sh

 #!/bin/bash
 
-OGRE_VERSION="v1.6.4"
+OGRE_VERSION="v1.6.5"
 # Only build for i386, halves the size
 ARCH="i386"
 REMOVE_ARCH="ppc"

SDK/Win32/ogresdk.nsh

 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "OGRE SDK"
-!define PRODUCT_VERSION "1.6.4"
+!define PRODUCT_VERSION "1.6.5"
 !define PRODUCT_PUBLISHER "The OGRE Team"
 !define PRODUCT_WEB_SITE "http://www.ogre3d.org"
 !ifdef MINGW

Samples/Common/setup/demos.wxs

 <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
 
   <Product 
-	  Name='OGRE Demos 1.6.4' 
+	  Name='OGRE Demos 1.6.5' 
 		Id='B3483083-1A14-4250-B196-AB82DE686742'
 		Language='1033' Codepage='1252' 
-		Version='1.6.4' Manufacturer='OGRE Project'>
+		Version='1.6.5' Manufacturer='OGRE Project'>
 
     <Package Id='????????-????-????-????-????????????' Keywords='Installer'
     Description="OGRE Demos Installer"

Tests/PlayPen/src/PlayPen.cpp

 		mCamera->setPosition(0,0,200);
 		mCamera->lookAt(0,0,0);
 
+		mWindow->getViewport(0)->setBackgroundColour(ColourValue::Blue);
+
 	
 	}
 
+	void test8TexturesFixedFunction()
+	{
+
+		MaterialPtr mat = MaterialManager::getSingleton().create("test8", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+		Pass* p = mat->getTechnique(0)->getPass(0);
+		// create 8 textures the same
+		for (int i = 0; i < 8; ++i)
+		{
+			TextureUnitState* tu = p->createTextureUnitState("gras_02.png");
+			tu->setColourOperation(LBO_ALPHA_BLEND);
+			tu->setTextureUScroll((Real)i / 10.f);
+			tu->setTextureAddressingMode(TextureUnitState::TAM_CLAMP);
+		}
+		mat->load();
+
+		Entity* e = mSceneMgr->createEntity("1", "cube.mesh");
+		e->setMaterialName(mat->getName());
+		mSceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(e);
+
+		mCamera->setPosition(0,0,200);
+		mCamera->lookAt(0,0,0);
+
+
+	}
+
+
+
 	// Testing sharedptr bug report
 	class CollisionShape
 	{
 	{
 		mSceneMgr->setAmbientLight( ColourValue( 1, 1, 1 ) );
 
-		ManualObject *manual = mSceneMgr->createManualObject("manual");
-		manual->begin("BaseWhiteNoLighting", RenderOperation::OT_LINE_STRIP);
-
-		manual->position(-100.0, -100.0, 0.0);
-		manual->position(100.0, -100.0, 0.0);
-		manual->position(100.0, 100.0, 0.0);
-		manual->position(-100.0, 100.0, 0.0);
-
-		manual->index(0);
-		manual->index(1);
-		manual->index(2);
-		manual->index(3);
-		manual->index(0);
-
-		manual->end();
-		SceneNode *node = mSceneMgr->getRootSceneNode()->createChildSceneNode();
-		node->attachObject(manual);
-
-		// of course the following two lines are pointless,
-		// only for demonstration purposes
-		node->detachObject(manual);
-		mSceneMgr->destroyManualObject(manual); //CRASH HERE 
+		Entity* e = mSceneMgr->createEntity("1", "left-staple-portAnimnextSurface0Side0.mesh");
+		mSceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(e);
+		//e->setDisplaySkeleton(true);
+
+		mAnimState = e->getAnimationState("next");
+		mAnimState->setEnabled(true);
+
+
+		mCamera->setPosition(0, 30, 30);
+		mCamera->lookAt(Vector3::ZERO);
+		mCamera->setNearClipDistance(1);
+		mCamera->setFarClipDistance(1000);
+
 	}
 
 	void testManualObject2D()
 	void testAlphaToCoverage()
 	{
 
+		mSceneMgr->setSkyBox(true, "Examples/CloudyNoonSkyBox");
+
+
 		MaterialPtr mat = MaterialManager::getSingleton().create("testa2c", 
 			ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
 		Pass* p = mat->getTechnique(0)->getPass(0);
-		p->setAlphaRejectSettings(CMPF_GREATER, 96);
+		p->setAlphaRejectSettings(CMPF_GREATER, 0);
 		p->setLightingEnabled(false);
 		p->setCullingMode(CULL_NONE);
 		p->setAlphaToCoverageEnabled(true);
-		TextureUnitState* t = p->createTextureUnitState("leaf.png");
+		TextureUnitState* t = p->createTextureUnitState("TextureAtlas_Diffuse.dds");
 		t->setTextureAddressingMode(TextureUnitState::TAM_CLAMP);
 		Entity *e = mSceneMgr->createEntity("PlaneA2C", SceneManager::PT_PLANE);
 		e->setMaterialName(mat->getName());
+		e->setRenderQueueGroup(RENDER_QUEUE_MAIN + 1);
 		mSceneMgr->getRootSceneNode()->createChildSceneNode(Vector3(100, 0, 0))->attachObject(e);
 
 
 		p->setLightingEnabled(false);
 		p->setCullingMode(CULL_NONE);
 		p->setAlphaToCoverageEnabled(false);
-		t = p->createTextureUnitState("leaf.png");
+		t = p->createTextureUnitState("TextureAtlas_Diffuse.dds");
 		t->setTextureAddressingMode(TextureUnitState::TAM_CLAMP);
 		e = mSceneMgr->createEntity("PlaneNoA2C", SceneManager::PT_PLANE);
 		e->setMaterialName(mat->getName());
 		mSceneMgr->getRootSceneNode()->createChildSceneNode(Vector3(-100, 0, 0))->attachObject(e);
 
+
+		Plane plane;
+		plane.normal = Vector3::UNIT_Y;
+		plane.d = 0;
+		MeshManager::getSingleton().createPlane("Myplane",
+			ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, plane,
+			4500,4500,10,10,true,1,5,5,Vector3::UNIT_Z);
+		Entity* pPlaneEnt = mSceneMgr->createEntity( "plane", "Myplane" );
+		pPlaneEnt->setMaterialName("Examples/GrassFloor");
+		pPlaneEnt->setCastShadows(false);
+		mSceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(pPlaneEnt);
+
+		/*
 		mat = MaterialManager::getSingleton().create("bg", 
 			ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
 		p = mat->getTechnique(0)->getPass(0);
 		SceneNode* s = mSceneMgr->getRootSceneNode()->createChildSceneNode(Vector3(0, 0, -10));
 		s->setScale(5,5,5);
 		s->attachObject(e);
+		*/
 
 		mCamera->setPosition(0,0,300);
 		mCamera->lookAt(Vector3::ZERO);
 
 	void createScene(void)
     {
-
-
-		mCamera->setPosition(-0.19199729, 1.0310142, -41.884644);
-		mCamera->setDirection(Vector3::NEGATIVE_UNIT_Z);
-		mCamera->setNearClipDistance(5);
-		mCamera->setFarClipDistance(5000);
-		Vector3 worldPos(-3.2326765, 2.003727, -59.996029);
-
-		Ogre::Vector3 pos = mCamera->getProjectionMatrix() * mCamera->getViewMatrix() * worldPos;
-		
-		// test image format identification
-		DataStreamPtr stream = ResourceGroupManager::getSingleton().openResource("ASCII.dds", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-		//DataStreamPtr stream = ResourceGroupManager::getSingleton().openResource("grassWalpha.tga", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-		//DataStreamPtr stream = ResourceGroupManager::getSingleton().openResource("GreenSkin.jpg", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-		//DataStreamPtr stream = ResourceGroupManager::getSingleton().openResource("ogreborder.png", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-		String typ = Image::getFileExtFromMagic(stream);
-
-		std::cout << pos;
+		Mesh::SubMeshNameMap map;
+		String nm("testName");
+		map["testName"] = 0;
+		map[nm] = 1;
+
+		mSceneMgr->setAmbientLight(ColourValue(0.3, 0.3, 0.3));
+		Light* lgh = mSceneMgr->createLight("mylight");
+		lgh->setType(Light::LT_DIRECTIONAL);
+		lgh->setDirection(Vector3::NEGATIVE_UNIT_Y);
+
+		mCamera->setPosition(0, 0, -100);
+		mCamera->lookAt(Vector3::ZERO);
+
 
 		AnyNumeric anyInt1(43);
 		AnyNumeric anyInt2(5);
         //testStencilShadows(SHADOWTYPE_STENCIL_ADDITIVE, true, true);
         //testStencilShadows(SHADOWTYPE_STENCIL_MODULATIVE, false, true);
         //testTextureShadows(SHADOWTYPE_TEXTURE_ADDITIVE, true);
-		//testTextureShadows(SHADOWTYPE_TEXTURE_MODULATIVE, true);
+		testTextureShadows(SHADOWTYPE_TEXTURE_MODULATIVE, true);
 		//testTextureShadowsIntegrated();
 		//testTextureShadowsIntegratedPSSM();
 		//testStencilShadowsMixedOpSubMeshes(false, true);
 		//testSimpleMesh();
 		//test2Windows();
 		//testStaticGeometry();
-		testStaticGeometryWithLOD(true);
+		//testStaticGeometryWithLOD(true);
 		//testBillboardTextureCoords();
 		//testBillboardOrigins();
 		//testReloadResources();
 		//testMRTCompositorScript();
 		//testSpotlightViewProj(true);
 		//test16Textures();
+		//test8TexturesFixedFunction();
 		//testProjectSphere();
 		//testLightScissoring(true);
 		//testLightClipPlanes(false);

Tools/Common/setup/commandlinetools.wxs

 		Name='OGRE Command Line Tools' 
 		Id='5940AABD-1573-4cbc-B82F-CA526690FEB5'
 		Language='1033' Codepage='1252' 
-		Version='1.6.4' Manufacturer='OGRE Project'>
+		Version='1.6.5' Manufacturer='OGRE Project'>
 
     	<Package Id='????????-????-????-????-????????????' Keywords='Installer'
 			Description="OGRE Command Line Tools Installer"

Tools/MilkshapeExport/setup/milkshapeinstall.wxs

 		Name='OGRE Milkshape Exporter' 
 		Id='CFE34964-1DAB-43b3-9540-07A0B77CC6FB'
 		Language='1033' Codepage='1252' 
-		Version='1.6.4' Manufacturer='OGRE Project'>
+		Version='1.6.5' Manufacturer='OGRE Project'>
 
     	<Package Id='????????-????-????-????-????????????' Keywords='Installer'
       		Description="OGREMilkshape Exporter Installer"

Tools/XSIExport/setup/xsi5install.wxs

   		Name='OGRE XSI v5.x Exporter' 
 		Id='6F7C886C-AC7C-481B-B244-236DF5D2D312'
 		Language='1033' Codepage='1252' 
-		Version='1.6.4' Manufacturer='OGRE Project'>
+		Version='1.6.5' Manufacturer='OGRE Project'>
 
     	<Package Id='????????-????-????-????-????????????' Keywords='Installer'
       		Description="OGRE XSI v5.x Exporter Installer"

Tools/XSIExport/setup/xsi6install.wxs

 		Name='OGRE XSI v6.x Exporter' 
 		Id='5F080D9B-BFE5-4aff-9105-E1DECFBA208F'
 		Language='1033' Codepage='1252' 
-		Version='1.6.4' Manufacturer='OGRE Project'>
+		Version='1.6.5' Manufacturer='OGRE Project'>
 
     	<Package Id='????????-????-????-????-????????????' Keywords='Installer'
       		Description="OGRE XSI v6.x Exporter Installer"
 AC_PREREQ(2.50)
 
-AC_INIT([OGRE], [1.6.4])
+AC_INIT([OGRE], [1.6.5])
 
 AC_CANONICAL_TARGET
 
 # New syntax; PACKAGE gets defined as 'OGRE' not 'ogre'
-AM_INIT_AUTOMAKE([OGRE], 1.6.4)
+AM_INIT_AUTOMAKE([OGRE], 1.6.5)
 AC_CONFIG_HEADERS([OgreMain/include/config.h])
 
 dnl Check for programs