Menu
▾
▴
[Hgengine-cvs] SF.net SVN: hgengine:[189] Mercury2
|
From: <axl...@us...> - 2009-03-21 02:18:47
|
Revision: 189
http://hgengine.svn.sourceforge.net/hgengine/?rev=189&view=rev
Author: axlecrusher
Date: 2009-03-21 02:18:27 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
add more XML fallback
Modified Paths:
--------------
Mercury2/mercury2.kdevelop
Mercury2/scenegraph.xml
Mercury2/src/XMLParser.cpp
Mercury2/src/XMLParser.h
Modified: Mercury2/mercury2.kdevelop
===================================================================
--- Mercury2/mercury2.kdevelop 2009-03-20 04:03:50 UTC (rev 188)
+++ Mercury2/mercury2.kdevelop 2009-03-21 02:18:27 UTC (rev 189)
@@ -24,7 +24,7 @@
<useconfiguration>debug</useconfiguration>
</general>
<run>
- <mainprogram/>
+ <mainprogram>/home/josh/Mercury2/debug/src/mercury2</mainprogram>
<terminal>false</terminal>
<programargs/>
<globaldebugarguments/>
@@ -37,7 +37,7 @@
</run>
<configurations>
<optimized>
- <builddir>optimized</builddir>
+ <builddir>/home/josh/Mercury2/optimized</builddir>
<ccompiler>kdevgccoptions</ccompiler>
<cxxcompiler>kdevgppoptions</cxxcompiler>
<f77compiler>kdevg77options</f77compiler>
@@ -55,14 +55,14 @@
</optimized>
<debug>
<configargs>--enable-debug=full</configargs>
- <builddir>debug</builddir>
+ <builddir>/home/josh/Mercury2/debug</builddir>
<ccompiler>kdevgccoptions</ccompiler>
<cxxcompiler>kdevgppoptions</cxxcompiler>
<f77compiler>kdevg77options</f77compiler>
- <cxxflags>-O2 -g -Wall</cxxflags>
+ <cxxflags>-O0 -g -Wall</cxxflags>
<envvars/>
<topsourcedir/>
- <cppflags>-Isrc/ -I/usr/include/libxml2/ -DHGENGINE -DRUN_FROM_START_FOLDER -DUSE_SSE</cppflags>
+ <cppflags>-Isrc/ -I/usr/include/libxml2/ -DHGENGINE -DRUN_FROM_START_FOLDER</cppflags>
<ldflags>-lpthread -lX11 -lGL -lxml2 -lpng</ldflags>
<ccompilerbinary/>
<cxxcompilerbinary/>
@@ -259,4 +259,33 @@
<outputradix>10</outputradix>
</display>
</kdevdebugger>
+ <dist>
+ <custom>false</custom>
+ <bzip>false</bzip>
+ <archname/>
+ <appname>Mercury2</appname>
+ <version>2.0</version>
+ <release/>
+ <vendor/>
+ <licence/>
+ <summary/>
+ <group/>
+ <packager/>
+ <description/>
+ <changelog/>
+ <devpackage>false</devpackage>
+ <docspackage>false</docspackage>
+ <appicon>false</appicon>
+ <arch>2</arch>
+ <genHTML>false</genHTML>
+ <useRPM>false</useRPM>
+ <ftpkde>false</ftpkde>
+ <appskde>false</appskde>
+ <url/>
+ </dist>
+ <ctagspart>
+ <customArguments/>
+ <customTagfilePath>/home/josh/Mercury2/tags</customTagfilePath>
+ <activeTagsFiles/>
+ </ctagspart>
</kdevelop>
Modified: Mercury2/scenegraph.xml
===================================================================
--- Mercury2/scenegraph.xml 2009-03-20 04:03:50 UTC (rev 188)
+++ Mercury2/scenegraph.xml 2009-03-21 02:18:27 UTC (rev 189)
@@ -7,28 +7,24 @@
<asset type="texture" file="test.bmp"/>
<asset type="quad"/>
</node>
- <node type="transformnode" movx="-1" movy="-1" fallback="fallbackTest">
- <node type="renderablenode">
- <asset type="quad"/>
- </node>
- </node>
</node>
- <node type="transformnode" movx="-1" movy="-1" fallback="fallbackTest">
+ <node type="transformnode" movz="-3" movx="-1" movy="-1">
<node type="renderablenode">
<asset type="quad"/>
</node>
</node>
- <node type="transformnode" movx="1" movy="-1" fallback="fallbackTest">
+ <node type="transformnode" movz="-3" movx="1" movy="-1" >
<node type="renderablenode">
<asset type="texture" file="test2.png"/>
<asset type="texture" file="test.bmp"/>
<asset type="quad"/>
</node>
</node>
- <node type="rotatornode" movy="0" movz="-2" scalex="0.25" scaley="0.25" scalez="0.25" >
- <node type="renderablenode">
- <asset type="texture" file="test.bmp"/>
- <asset type="hgmdlmodel" file="beerhall.hgmdl"/>
+ <node type="transformnode" movx="1" movy="1" fallback="fallbackTest">
+ <node type="transformnode" movx="-2">
+ <node type="renderablenode">
+ <asset type="quad"/>
+ </node>
</node>
</node>
</SceneGraph>
Modified: Mercury2/src/XMLParser.cpp
===================================================================
--- Mercury2/src/XMLParser.cpp 2009-03-20 04:03:50 UTC (rev 188)
+++ Mercury2/src/XMLParser.cpp 2009-03-21 02:18:27 UTC (rev 189)
@@ -12,13 +12,14 @@
}
XMLNode::XMLNode(const XMLNode& n)
- :m_node(n.m_node)
+ :m_node(n.m_node), m_doc(n.m_doc)
{
}
XMLNode::~XMLNode()
{
m_node = NULL;
+ m_doc = NULL;
}
XMLNode XMLNode::NextNode() const
@@ -29,9 +30,9 @@
if (node->type == XML_ELEMENT_NODE)
return XMLNode(node,m_doc);
-//falling back here seem like a bad idea, high chance of infinite loops?
-// XMLNode fall = FindFallbackNode();
-// return fall.NextNode();
+ XMLNode parent(m_node->parent, m_doc);
+ XMLNode fall = parent.FindFallbackNode();
+ return fall.Child();
}
return XMLNode();
}
@@ -43,10 +44,6 @@
for (xmlNode* node = m_node->prev; node; node=node->prev)
if (node->type == XML_ELEMENT_NODE)
return XMLNode(node,m_doc);
-
-//falling back here seem like a bad idea, high chance of infinite loops?
-// XMLNode fall = FindFallbackNode();
-// return fall.PreviousNode();
}
return XMLNode();
}
@@ -58,9 +55,8 @@
for (xmlNode* node = m_node->children; node; node=node->next)
if (node->type == XML_ELEMENT_NODE) return XMLNode(node,m_doc);
-//falling back here seem like a bad idea, high chance of infinite loops?
-// XMLNode fall = FindFallbackNode();
-// return fall.Child();
+ XMLNode fall = FindFallbackNode();
+ return fall.Child();
}
return XMLNode();
}
@@ -147,6 +143,12 @@
return *this;
}
+const XMLNode& XMLNode::operator=(const XMLNode& n)
+{
+ m_node = n.m_node;
+ m_doc = n.m_doc;
+}
+
XMLDocument::XMLDocument()
:m_doc(NULL)
{
Modified: Mercury2/src/XMLParser.h
===================================================================
--- Mercury2/src/XMLParser.h 2009-03-20 04:03:50 UTC (rev 188)
+++ Mercury2/src/XMLParser.h 2009-03-21 02:18:27 UTC (rev 189)
@@ -33,6 +33,8 @@
inline bool IsValid() const { return m_node!=NULL; }
XMLNode FindFallbackNode() const;
+
+ const XMLNode& operator=(const XMLNode& n);
private:
XMLNode RecursiveFindFallbackNode(const MString& path) const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
