[Hgengine-cvs] SF.net SVN: hgengine:[749] Mercury2/src

[<axl...@us...>]

Revision: 749
          http://hgengine.svn.sourceforge.net/hgengine/?rev=749&view=rev
Author:   axlecrusher
Date:     2010-05-23 15:56:37 +0000 (Sun, 23 May 2010)

Log Message:
-----------
fix windows compile VS2008

Modified Paths:
--------------
    Mercury2/src/MercuryMath.cpp
    Mercury2/src/MercuryNode.h
    Mercury2/src/OGLExtensions.cpp
    Mercury2/src/OGLExtensions.h

Modified: Mercury2/src/MercuryMath.cpp
===================================================================
--- Mercury2/src/MercuryMath.cpp	2010-05-23 15:56:04 UTC (rev 748)
+++ Mercury2/src/MercuryMath.cpp	2010-05-23 15:56:37 UTC (rev 749)
@@ -143,6 +143,13 @@
 		f[i] = r[i];
 }
 */
+void LoadIdentity(FloatRow* matrix)
+{
+	float *m = (float*)matrix;
+	for (uint8_t i = 0; i < 16; ++i)
+		m[i] = i%5?0.0f:1.0f;
+}
+
 void MMCrossProduct( const FloatRow& r1, const FloatRow& r2, FloatRow& result)
 {
 	FloatRow r;

Modified: Mercury2/src/MercuryNode.h
===================================================================
--- Mercury2/src/MercuryNode.h	2010-05-23 15:56:04 UTC (rev 748)
+++ Mercury2/src/MercuryNode.h	2010-05-23 15:56:37 UTC (rev 749)
@@ -123,19 +123,19 @@
 		virtual void Render(const MercuryMatrix& matrix);
 		virtual void PostRender(const MercuryMatrix& matrix);
 		
-		virtual void SetHidden( bool bHide ) { m_flags = SetBit(m_flags,HIDDEN,bHide); } //is there anyway to make this not virtual??
+		virtual void SetHidden( bool bHide ) { m_flags = (uint8_t)SetBit(m_flags,HIDDEN,bHide); } //is there anyway to make this not virtual??
 		inline bool IsHidden() { return GetBit(m_flags,HIDDEN); }
 		
-		inline void SetCulled(bool t) { m_flags = SetBit(m_flags,CULLED,t); }
+		inline void SetCulled(bool t) { m_flags = (uint8_t)SetBit(m_flags,CULLED,t); }
 		inline bool IsCulled() const { return GetBit(m_flags,CULLED); }
 
-		inline void SetSaveChildren(bool t) { m_flags = SetBit(m_flags,SAVECHILDREN,t); }
+		inline void SetSaveChildren(bool t) { m_flags = (uint8_t)SetBit(m_flags,SAVECHILDREN,t); }
 		inline bool GetSaveChildren() const { return GetBit(m_flags,SAVECHILDREN); }
 
-		inline void SetEnableSave(bool t) { m_flags = SetBit(m_flags,ENABLESAVE,t); }
+		inline void SetEnableSave(bool t) { m_flags = (uint8_t)SetBit(m_flags,ENABLESAVE,t); }
 		inline bool GetEnableSave() const { return GetBit(m_flags,ENABLESAVE); }
 
-		inline void SetUseAlphaPass(bool t) { m_flags = SetBit(m_flags,ALPHAPATH,t); }
+		inline void SetUseAlphaPass(bool t) { m_flags = (uint8_t)SetBit(m_flags,ALPHAPATH,t); }
 		inline bool GetUseAlphaPass() const { return GetBit(m_flags,ALPHAPATH); }
 
 		virtual MercuryMatrix ManipulateMatrix(const MercuryMatrix& matrix);

Modified: Mercury2/src/OGLExtensions.cpp
===================================================================
--- Mercury2/src/OGLExtensions.cpp	2010-05-23 15:56:04 UTC (rev 748)
+++ Mercury2/src/OGLExtensions.cpp	2010-05-23 15:56:37 UTC (rev 749)
@@ -12,6 +12,7 @@
 
 PFNGLGENBUFFERSARBPROC glGenBuffersARB;
 PFNGLBUFFERDATAARBPROC glBufferDataARB;
+PFNGLBUFFERSUBDATAARBPROC glBufferSubDataARB;
 PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
 
 
@@ -70,6 +71,7 @@
 EXTENSION( PFNGLCLIENTACTIVETEXTUREARBPROC,glClientActiveTextureARB );
 EXTENSION( PFNGLGENBUFFERSARBPROC,glGenBuffersARB );
 EXTENSION( PFNGLBUFFERDATAARBPROC,glBufferDataARB );
+EXTENSION( PFNGLBUFFERSUBDATAARBPROC,glBufferSubDataARB );
 EXTENSION( PFNGLDRAWRANGEELEMENTSPROC,glDrawRangeElements );
 
 

Modified: Mercury2/src/OGLExtensions.h
===================================================================
--- Mercury2/src/OGLExtensions.h	2010-05-23 15:56:04 UTC (rev 748)
+++ Mercury2/src/OGLExtensions.h	2010-05-23 15:56:37 UTC (rev 749)
@@ -8,6 +8,7 @@
 extern PFNGLCLIENTACTIVETEXTUREARBPROC	glClientActiveTextureARB;
 extern PFNGLGENBUFFERSARBPROC glGenBuffersARB;
 extern PFNGLBUFFERDATAARBPROC glBufferDataARB;
+extern PFNGLBUFFERSUBDATAARBPROC glBufferSubDataARB;
 extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
 
 //glsl


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