[Hgengine-cvs] SF.net SVN: hgengine:[98] Mercury2

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

Revision: 98
          http://hgengine.svn.sourceforge.net/hgengine/?rev=98&view=rev
Author:   axlecrusher
Date:     2008-12-30 19:21:53 +0000 (Tue, 30 Dec 2008)

Log Message:
-----------
updates

Modified Paths:
--------------
    Mercury2/docs/MercuryBinaryModelFormat.odt
    Mercury2/mercury2.kdevelop
    Mercury2/scenegraph.xml
    Mercury2/src/HGMDLModel.cpp
    Mercury2/src/HGMDLModel.h
    Mercury2/src/TransformNode.cpp
    Mercury2/src/TransformNode.h
    Mercury2/src/X11Window.cpp

Added Paths:
-----------
    Mercury2/beerhall.hgmdl

Added: Mercury2/beerhall.hgmdl
===================================================================
(Binary files differ)


Property changes on: Mercury2/beerhall.hgmdl
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: Mercury2/docs/MercuryBinaryModelFormat.odt
===================================================================
(Binary files differ)

Modified: Mercury2/mercury2.kdevelop
===================================================================
--- Mercury2/mercury2.kdevelop	2008-12-30 15:25:26 UTC (rev 97)
+++ Mercury2/mercury2.kdevelop	2008-12-30 19:21:53 UTC (rev 98)
@@ -41,7 +41,18 @@
         <ccompiler>kdevgccoptions</ccompiler>
         <cxxcompiler>kdevgppoptions</cxxcompiler>
         <f77compiler>kdevg77options</f77compiler>
-        <cxxflags>-O2 -g0</cxxflags>
+        <cxxflags>-O2 -g0 -Wall</cxxflags>
+        <envvars/>
+        <configargs/>
+        <topsourcedir/>
+        <cppflags>-Isrc/ -I/usr/include/libxml2/
+</cppflags>
+        <ldflags>-lpthread -lX11 -lGL -lxml2 -lpng</ldflags>
+        <ccompilerbinary/>
+        <cxxcompilerbinary/>
+        <f77compilerbinary/>
+        <cflags/>
+        <f77flags/>
       </optimized>
       <debug>
         <configargs>--enable-debug=full</configargs>

Modified: Mercury2/scenegraph.xml
===================================================================
--- Mercury2/scenegraph.xml	2008-12-30 15:25:26 UTC (rev 97)
+++ Mercury2/scenegraph.xml	2008-12-30 19:21:53 UTC (rev 98)
@@ -20,4 +20,10 @@
 				<asset type="quad"/>
 			</node>
 		</node>
+		<node type="rotatornode" movz="-3" scalex="0.05" scaley="0.05" scalez="0.05" >
+			<node type="renderablenode">
+				<asset type="texture" imagefile="test.bmp"/>
+				<asset type="hgmdlmodel" file="beerhall.hgmdl"/>
+			</node>
+		</node>
 </SceneGraph>

Modified: Mercury2/src/HGMDLModel.cpp
===================================================================
--- Mercury2/src/HGMDLModel.cpp	2008-12-30 15:25:26 UTC (rev 97)
+++ Mercury2/src/HGMDLModel.cpp	2008-12-30 19:21:53 UTC (rev 98)
@@ -46,9 +46,8 @@
 
 void HGMDLModel::Render(MercuryNode* node)
 {
-	list< MAutoPtr< HGMDLMesh > >::iterator i = m_meshes.begin();
-	for(;i != m_meshes.end(); ++i)
-		(*i)->Render(node);
+	for(uint16_t i = 0; i < m_meshes.size(); ++i)
+		m_meshes[i]->Render(node);
 }
 
 HGMDLModel* HGMDLModel::Generate()

Modified: Mercury2/src/HGMDLModel.h
===================================================================
--- Mercury2/src/HGMDLModel.h	2008-12-30 15:25:26 UTC (rev 97)
+++ Mercury2/src/HGMDLModel.h	2008-12-30 19:21:53 UTC (rev 98)
@@ -4,6 +4,8 @@
 #include <MercuryAsset.h>
 #include <HGMDLMesh.h>
 
+#include <vector>
+
 class HGMDLModel : public MercuryAsset
 {
 	public:
@@ -16,7 +18,7 @@
 		virtual void Render(MercuryNode* node);
 
 	private:
-		std::list< MAutoPtr< HGMDLMesh > > m_meshes;
+		std::vector< MAutoPtr< HGMDLMesh > > m_meshes;
 };
 
 #endif

Modified: Mercury2/src/TransformNode.cpp
===================================================================
--- Mercury2/src/TransformNode.cpp	2008-12-30 15:25:26 UTC (rev 97)
+++ Mercury2/src/TransformNode.cpp	2008-12-30 19:21:53 UTC (rev 98)
@@ -1,6 +1,7 @@
 #include <TransformNode.h>
 
 REGISTER_NODE_TYPE(TransformNode);
+REGISTER_NODE_TYPE(RotatorNode);
 
 TransformNode::TransformNode()
 	:m_scale( MercuryPoint(1,1,1) )
@@ -143,6 +144,17 @@
 	}	
 }
 
+void RotatorNode::Update(float dTime)
+{
+	MercuryPoint r = GetRotation();
+	r.x += (dTime)*2.5;
+	r.y += (dTime)*5;
+	
+	SetRotation( r );
+	
+	TransformNode::Update(dTime);
+}
+
 /****************************************************************************
  *   Copyright (C) 2008 by Joshua Allen                                     *
  *                                                                          *

Modified: Mercury2/src/TransformNode.h
===================================================================
--- Mercury2/src/TransformNode.h	2008-12-30 15:25:26 UTC (rev 97)
+++ Mercury2/src/TransformNode.h	2008-12-30 19:21:53 UTC (rev 98)
@@ -12,7 +12,7 @@
 	public:
 		TransformNode();
 		
-		void Update(float dTime);
+		virtual void Update(float dTime);
 
 		void SetScale( const MercuryPoint& scale );
 		void SetPosition( const MercuryPoint& position );
@@ -41,13 +41,20 @@
 		MercuryPoint m_scale;
 		MercuryPoint m_position;
 		MercuryPoint m_rotation;
-		
+
 //		MercuryMatrix m_localMatrix;
 		MercuryMatrix m_globalMatrix;
 		
 		bool m_tainted;
 };
 
+class RotatorNode : public TransformNode
+{
+	public:
+		virtual void Update(float dTime);
+		GENRTTI(TransformNode);
+};
+
 #endif
 
 /****************************************************************************

Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp	2008-12-30 15:25:26 UTC (rev 97)
+++ Mercury2/src/X11Window.cpp	2008-12-30 19:21:53 UTC (rev 98)
@@ -125,11 +125,13 @@
 			case KeyPress:
 			{
 				XKeyEvent* e = (XKeyEvent*)&event;
+				e->keycode;
 				break;
 			}
 			case KeyRelease:
 			{
 				XKeyEvent* e = (XKeyEvent*)&event;
+				e->keycode;
 				break;
 			}
 			case MotionNotify:


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