[Python-ogre-commit] SF.net SVN: python-ogre:[867] trunk/python-ogre

[<and...@us...>]

Revision: 867
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=867&view=rev
Author:   andy_miller
Date:     2009-01-30 13:42:48 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
Update Changelog
Fix possible issue with Canvas based upon forum comments - testing yet to happen
Added multiple moduel dependencies to OgreODE (Ogre + Ode)

Modified Paths:
--------------
    trunk/python-ogre/ChangeLog.txt
    trunk/python-ogre/ThirdParty/canvas/Atlas.cpp
    trunk/python-ogre/ThirdParty/canvas/Canvas.cpp
    trunk/python-ogre/code_generators/ogre/generate_code.py
    trunk/python-ogre/code_generators/ogreode/generate_code.py
    trunk/python-ogre/demos/ogre/tests/Test_DataStream.py

Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt	2009-01-30 05:44:36 UTC (rev 866)
+++ trunk/python-ogre/ChangeLog.txt	2009-01-30 13:42:48 UTC (rev 867)
@@ -1,3 +1,7 @@
+xxxx 2009 : Release 1.6.1.xxx
+================================
+Fix: Exposed std::vector<bool> for joystick buttons in OIS
+
 Janurary 25 2009 : Release 1.6.1
 ================================
 Latest build using Ogre 1.6.1 -- Note that the underlying Ogre C++ is NOT Patched!! 

Modified: trunk/python-ogre/ThirdParty/canvas/Atlas.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/canvas/Atlas.cpp	2009-01-30 05:44:36 UTC (rev 866)
+++ trunk/python-ogre/ThirdParty/canvas/Atlas.cpp	2009-01-30 13:42:48 UTC (rev 867)
@@ -215,8 +215,9 @@
 			if(!bitmap.buffer || (!bitmap.rows && !bitmap.width))
 				continue;
 
-			unsigned char* buffer = new unsigned char[bitmap.rows * bitmap.pitch * 2];
-
+			//unsigned char* buffer = new unsigned char[bitmap.rows * bitmap.pitch * 2];
+            unsigned char* buffer = OGRE_ALLOC_T(unsigned char, bitmap.rows * bitmap.pitch * 2, Ogre::MEMCATEGORY_GENERAL);
+            
 			for(int idx = 0; idx < bitmap.rows * bitmap.pitch; idx++)
 			{
 				buffer[idx * 2] = 255;
@@ -251,7 +252,8 @@
 		rectangles.push_back(new ComputationRect(*i, resourceGroup));
 	}
 
-	unsigned char* vcolBuffer = new unsigned char[16];
+	//unsigned char* vcolBuffer = new unsigned char[16];
+    unsigned char* vcolBuffer = OGRE_ALLOC_T(unsigned char, 16, Ogre::MEMCATEGORY_GENERAL);
 	memset(vcolBuffer, 255, 16);
 
 	rectangles.push_back(new ComputationRect("VertexColor", vcolBuffer, 2, 2));

Modified: trunk/python-ogre/ThirdParty/canvas/Canvas.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/canvas/Canvas.cpp	2009-01-30 05:44:36 UTC (rev 866)
+++ trunk/python-ogre/ThirdParty/canvas/Canvas.cpp	2009-01-30 13:42:48 UTC (rev 867)
@@ -82,7 +82,7 @@
 ************************/
 
 Canvas::Canvas(Atlas* atlas, Ogre::Viewport* viewport) : atlas(atlas), viewport(viewport), vertexData(0), indexData(0),
-	bufferSize(100), renderQueueID(Ogre::RENDER_QUEUE_OVERLAY), isDirty(false), visibility(true)
+	bufferSize(100), renderQueueID(Ogre::RENDER_QUEUE_OVERLAY + 1), isDirty(false), visibility(true)
 {
 	viewport->getTarget()->addListener(this);
 	material = Ogre::MaterialManager::getSingleton().getByName(atlas->getMaterialName());

Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py	2009-01-30 05:44:36 UTC (rev 866)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py	2009-01-30 13:42:48 UTC (rev 867)
@@ -789,7 +789,8 @@
     common_utils.Fix_Pointer_Returns ( main_ns, pointee_types, ignore_names )   
 
     # functions that need to have implicit conversions turned off
-    ImplicitClasses=['Radian','Degree', 'TimeIndex', 'LiSPSMShadowCameraSetup' ] 
+    ## This is already turned off - don't want to turn it back on...
+    ImplicitClasses=[] ## 'Radian','Degree', 'TimeIndex', 'LiSPSMShadowCameraSetup' ] 
     common_utils.Fix_Implicit_Conversions ( main_ns, ImplicitClasses )
     
     # variables that are readonly and mutable need to be changed from 'vars' to properties so there

Modified: trunk/python-ogre/code_generators/ogreode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreode/generate_code.py	2009-01-30 05:44:36 UTC (rev 866)
+++ trunk/python-ogre/code_generators/ogreode/generate_code.py	2009-01-30 13:42:48 UTC (rev 867)
@@ -289,6 +289,7 @@
                                            
     # if this module depends on another set it here                                           
     mb.register_module_dependency ( environment.ogre.generated_dir )
+    mb.register_module_dependency ( environment.ois.generated_dir )
     
     # normally implicit conversions work OK, however they can cause strange things to happen so safer to leave off
     mb.constructors().allow_implicit_conversion = False                                           

Modified: trunk/python-ogre/demos/ogre/tests/Test_DataStream.py
===================================================================
--- trunk/python-ogre/demos/ogre/tests/Test_DataStream.py	2009-01-30 05:44:36 UTC (rev 866)
+++ trunk/python-ogre/demos/ogre/tests/Test_DataStream.py	2009-01-30 13:42:48 UTC (rev 867)
@@ -54,6 +54,9 @@
         print p
         
         ## if you want you can confirm this 
+        print dataptr
+        print type(dataptr)
+        #sys.exit()
         ogre.MaterialManager.getSingleton().parseScript( dataptr, "General" )   
         print "MATERIAL OK using Ctypes" 
         


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.