Menu
▾
▴
hgengine-cvs
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(46) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(185) |
Feb
(242) |
Mar
(237) |
Apr
(180) |
May
(102) |
Jun
(278) |
Jul
(114) |
Aug
(92) |
Sep
(246) |
Oct
(212) |
Nov
(279) |
Dec
(99) |
| 2007 |
Jan
(130) |
Feb
(194) |
Mar
(22) |
Apr
(72) |
May
(40) |
Jun
(111) |
Jul
(114) |
Aug
(154) |
Sep
(114) |
Oct
(2) |
Nov
(1) |
Dec
(5) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
(51) |
Nov
(34) |
Dec
(130) |
| 2009 |
Jan
(22) |
Feb
(20) |
Mar
(41) |
Apr
(45) |
May
(82) |
Jun
(96) |
Jul
(48) |
Aug
(90) |
Sep
(13) |
Oct
(49) |
Nov
(31) |
Dec
(21) |
| 2010 |
Jan
(25) |
Feb
(9) |
Mar
(7) |
Apr
(28) |
May
(27) |
Jun
(7) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
(1) |
Nov
(13) |
Dec
(2) |
| 2013 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <axl...@us...> - 2009-08-01 02:43:22
|
Revision: 444
http://hgengine.svn.sourceforge.net/hgengine/?rev=444&view=rev
Author: axlecrusher
Date: 2009-08-01 02:43:14 +0000 (Sat, 01 Aug 2009)
Log Message:
-----------
let shaders access viewport
Modified Paths:
--------------
Mercury2/src/Viewport.cpp
Modified: Mercury2/src/Viewport.cpp
===================================================================
--- Mercury2/src/Viewport.cpp 2009-07-31 00:59:08 UTC (rev 443)
+++ Mercury2/src/Viewport.cpp 2009-08-01 02:43:14 UTC (rev 444)
@@ -2,6 +2,8 @@
#include <GLHeaders.h>
#include <MercuryWindow.h>
+#include <Shader.h>
+
REGISTER_NODE_TYPE(Viewport);
const Frustum* FRUSTUM;
MercuryMatrix VIEWMATRIX;
@@ -47,6 +49,10 @@
glMatrixMode(GL_MODELVIEW);
+ ShaderAttribute sa;
+ sa.type = ShaderAttribute::TYPE_INT4;
+ glGetIntegerv(GL_VIEWPORT, sa.value.iInts);
+ Shader::SetAttribute("HG_ViewPort", sa);
}
void Viewport::PostRender(const MercuryMatrix& matrix)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-07-31 00:59:21
|
Revision: 443
http://hgengine.svn.sourceforge.net/hgengine/?rev=443&view=rev
Author: axlecrusher
Date: 2009-07-31 00:59:08 +0000 (Fri, 31 Jul 2009)
Log Message:
-----------
allow other color types besides RGBA
Modified Paths:
--------------
Mercury2/src/GLHelpers.cpp
Mercury2/src/GLHelpers.h
Mercury2/src/MercuryFBO.cpp
Mercury2/src/Orthographic.cpp
Mercury2/src/RawImageData.h
Mercury2/src/Texture.cpp
Mercury2/src/Texture.h
Modified: Mercury2/src/GLHelpers.cpp
===================================================================
--- Mercury2/src/GLHelpers.cpp 2009-07-31 00:55:58 UTC (rev 442)
+++ Mercury2/src/GLHelpers.cpp 2009-07-31 00:59:08 UTC (rev 443)
@@ -78,6 +78,30 @@
return MercuryVertex( (float)mouseX, (float)mouseY, (float)mouseZ );
}
+GLenum ToGLColorType(ColorByteType cbt)
+{
+ switch (cbt)
+ {
+ case WHITE:
+ return GL_LUMINANCE;
+ case WHITE_ALPHA:
+ return GL_LUMINANCE_ALPHA;
+ case RGB:
+ return GL_RGB;
+ case RGBA:
+ return GL_RGBA;
+ case RGB16:
+ return GL_RGBA16;
+ case RGBA16:
+ return GL_RGBA16;
+ break;
+ default:
+ printf( "Unsupported color byte type (%d)\n", cbt );
+ return GL_RGB;
+ }
+
+}
+
/****************************************************************************
* Copyright (C) 2009 by Joshua Allen *
* *
Modified: Mercury2/src/GLHelpers.h
===================================================================
--- Mercury2/src/GLHelpers.h 2009-07-31 00:55:58 UTC (rev 442)
+++ Mercury2/src/GLHelpers.h 2009-07-31 00:59:08 UTC (rev 443)
@@ -3,10 +3,13 @@
#include <MercuryMatrix.h>
#include <MercuryVertex.h>
+#include <RawImageData.h>
+
MString GlError2String(uint32_t e);
void glLoadMatrix(const MercuryMatrix& m);
MercuryMatrix glGetMatrix(int m);
MercuryVertex pointFromScreenLoc(int screen_x, int screen_y);
+GLenum ToGLColorType(ColorByteType cbt);
/****************************************************************************
* Copyright (C) 2009 by Joshua Allen *
Modified: Mercury2/src/MercuryFBO.cpp
===================================================================
--- Mercury2/src/MercuryFBO.cpp 2009-07-31 00:55:58 UTC (rev 442)
+++ Mercury2/src/MercuryFBO.cpp 2009-07-31 00:59:08 UTC (rev 443)
@@ -46,7 +46,7 @@
{
MString n = ssprintf("%s_%d", m_name.c_str(), i);
m_textures[i] = Texture::LoadDynamicTexture(n);
- m_textures[i]->MakeDynamic(m_width, m_height,n);
+ m_textures[i]->MakeDynamic(m_width, m_height, RGBA, n);
}
}
@@ -90,7 +90,7 @@
for (uint8_t i = 0; i < m_numTextures; ++i)
{
MString n = ssprintf("%s_%d", m_name.c_str(), i);
- m_textures[i]->MakeDynamic(m_width, m_height,n);
+ m_textures[i]->MakeDynamic(m_width, m_height, RGBA, n);
}
}
Bind();
Modified: Mercury2/src/Orthographic.cpp
===================================================================
--- Mercury2/src/Orthographic.cpp 2009-07-31 00:55:58 UTC (rev 442)
+++ Mercury2/src/Orthographic.cpp 2009-07-31 00:59:08 UTC (rev 443)
@@ -36,8 +36,6 @@
void Orthographic::LoadFromXML(const XMLNode& node)
{
- MercuryWindow* w = MercuryWindow::GetCurrentWindow();
-
m_frustum.Ortho( StrToFloat(node.Attribute("left")),
StrToFloat(node.Attribute("right")),
StrToFloat(node.Attribute("bottom")),
Modified: Mercury2/src/RawImageData.h
===================================================================
--- Mercury2/src/RawImageData.h 2009-07-31 00:55:58 UTC (rev 442)
+++ Mercury2/src/RawImageData.h 2009-07-31 00:59:08 UTC (rev 443)
@@ -6,7 +6,9 @@
WHITE,
WHITE_ALPHA,
RGB,
- RGBA
+ RGBA,
+ RGB16,
+ RGBA16,
};
class RawImageData
Modified: Mercury2/src/Texture.cpp
===================================================================
--- Mercury2/src/Texture.cpp 2009-07-31 00:55:58 UTC (rev 442)
+++ Mercury2/src/Texture.cpp 2009-07-31 00:59:08 UTC (rev 443)
@@ -49,28 +49,8 @@
if ( !m_textureID ) glGenTextures(1, &m_textureID);
// m_raw = raw;
- int ByteType;
+ GLenum byteType = ToGLColorType( m_raw->m_ColorByteType );
- switch (m_raw->m_ColorByteType)
- {
- case WHITE:
- ByteType = GL_LUMINANCE;
- break;
- case WHITE_ALPHA:
- ByteType = GL_LUMINANCE_ALPHA;
- break;
- case RGB:
- ByteType = GL_RGB;
- break;
- case RGBA:
- ByteType = GL_RGBA;
- break;
- default:
- printf( "Unsupported byte type (%d) in Texture::LoadFromRaw\n", m_raw->m_ColorByteType );
- ByteType = GL_RGB;
- break;
- }
-
glBindTexture(GL_TEXTURE_2D, m_textureID);
/*
glTexImage2D(GL_TEXTURE_2D,
@@ -83,7 +63,7 @@
GL_UNSIGNED_BYTE,
m_raw->m_data);
*/
- gluBuild2DMipmaps( GL_TEXTURE_2D, ByteType, m_raw->m_width, m_raw->m_height, ByteType, GL_UNSIGNED_BYTE, m_raw->m_data );
+ gluBuild2DMipmaps( GL_TEXTURE_2D, byteType, m_raw->m_width, m_raw->m_height, byteType, GL_UNSIGNED_BYTE, m_raw->m_data );
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
@@ -94,7 +74,7 @@
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
// gluBuild2DMipmaps( GL_TEXTURE_2D, 3, m_raw->m_width, m_raw->m_height, ByteType, GL_UNSIGNED_BYTE, m_raw->m_data );
-
+ SAFE_DELETE(m_raw);
};
void Texture::Render(const MercuryNode* node)
@@ -121,7 +101,7 @@
MString file = node.Attribute("file");
if ( dynamic )
- MakeDynamic( 0, 0, file );
+ MakeDynamic( 0, 0, RGBA, file );
else
LoadImagePath( file );
}
@@ -188,7 +168,7 @@
m_raw = raw;
}
-void Texture::MakeDynamic(uint16_t width, uint16_t height, const MString& name)
+void Texture::MakeDynamic(uint16_t width, uint16_t height, ColorByteType cbt, const MString& name)
{
// Clean();
@@ -200,7 +180,7 @@
if (m_textureID == 0) glGenTextures( 1, &m_textureID );
glBindTexture( GL_TEXTURE_2D, m_textureID );
- glCopyTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0 );
+ glCopyTexImage2D( GL_TEXTURE_2D, 0, ToGLColorType(cbt), 0, 0, width, height, 0 );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glBindTexture( GL_TEXTURE_2D, 0 );
Modified: Mercury2/src/Texture.h
===================================================================
--- Mercury2/src/Texture.h 2009-07-31 00:55:58 UTC (rev 442)
+++ Mercury2/src/Texture.h 2009-07-31 00:59:08 UTC (rev 443)
@@ -25,9 +25,8 @@
inline static uint32_t ReadAndResetBindCount() { uint32_t t = m_textureBinds; m_textureBinds = 0; return t; }
inline uint32_t TextureID() const { return m_textureID; }
- void MakeDynamic(uint16_t width, uint16_t height, const MString& name);
+ void MakeDynamic(uint16_t width, uint16_t height, ColorByteType cbt, const MString& name);
-
static Texture* Generate();
static MAutoPtr< Texture > LoadFromFile(const MString& path);
static MAutoPtr< Texture > LoadDynamicTexture(const MString& name);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-07-31 00:56:05
|
Revision: 442
http://hgengine.svn.sourceforge.net/hgengine/?rev=442&view=rev
Author: axlecrusher
Date: 2009-07-31 00:55:58 +0000 (Fri, 31 Jul 2009)
Log Message:
-----------
remove commented out code
Modified Paths:
--------------
Mercury2/src/Viewport.cpp
Modified: Mercury2/src/Viewport.cpp
===================================================================
--- Mercury2/src/Viewport.cpp 2009-07-26 02:52:54 UTC (rev 441)
+++ Mercury2/src/Viewport.cpp 2009-07-31 00:55:58 UTC (rev 442)
@@ -29,24 +29,6 @@
glMatrixMode(GL_MODELVIEW);
- //compute the position of the eye
-// EYE = MercuryVertex(0,0,0,1); //wrong
-// EYE = matrix * EYE;
-
-// VIEWMATRIX = matrix;
-
- //the camera sets this (the calculation here is wrong)
-// MercuryVector z(0,0,-1); //look down Z by default
-// LOOKAT = (matrix * z).Normalize();
-
-// matrix.Print();
-// EYE.Print("Eye");
-// LOOKAT.Print("Lookat");
-// printf("******\n");
-// LOOKAT = (matrix * l).Normalize();
-// LOOKAT.
-// LOOKAT.Print();
-
//Sets up the clipping frustum
m_frustum.LookAt(EYE, LOOKAT, MercuryVertex(0,1,0));
}
@@ -65,26 +47,6 @@
glMatrixMode(GL_MODELVIEW);
- //compute the position of the eye
-// EYE = MercuryVertex(0,0,0,1); //wrong
-// EYE = matrix * EYE;
-
-// VIEWMATRIX = matrix;
-
- //the camera sets this (the calculation here is wrong)
-// MercuryVector z(0,0,-1); //look down Z by default
-// LOOKAT = (matrix * z).Normalize();
-
-// matrix.Print();
-// EYE.Print("Eye");
-// LOOKAT.Print("Lookat");
-// printf("******\n");
-// LOOKAT = (matrix * l).Normalize();
-// LOOKAT.
-// LOOKAT.Print();
-
- //Sets up the clipping frustum
-// m_frustum.LookAt(EYE, LOOKAT, MercuryVertex(0,1,0));
}
void Viewport::PostRender(const MercuryMatrix& matrix)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-07-26 02:53:03
|
Revision: 441
http://hgengine.svn.sourceforge.net/hgengine/?rev=441&view=rev
Author: axlecrusher
Date: 2009-07-26 02:52:54 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
tweak how RecursiveRender and RecursivePreRender.
Orthographic view works.
Modified Paths:
--------------
Mercury2/Themes/default/File/scenegraph.xml
Mercury2/src/MercuryNode.cpp
Mercury2/src/MercuryNode.h
Mercury2/src/TransformNode.cpp
Mercury2/src/TransformNode.h
Mercury2/src/Viewport.h
Modified: Mercury2/Themes/default/File/scenegraph.xml
===================================================================
--- Mercury2/Themes/default/File/scenegraph.xml 2009-07-26 02:13:48 UTC (rev 440)
+++ Mercury2/Themes/default/File/scenegraph.xml 2009-07-26 02:52:54 UTC (rev 441)
@@ -38,7 +38,7 @@
</node>
</node>
</node>
-<!-- <node type="orthographic" left="0" right="1" top="0" bottom="1" near="-1" far="1">
+ <node type="orthographic" left="0" right="1" top="1" bottom="0" near="-1" far="1">
<asset type="quad"/>
- </node> -->
+ </node>
</SceneGraph>
Modified: Mercury2/src/MercuryNode.cpp
===================================================================
--- Mercury2/src/MercuryNode.cpp 2009-07-26 02:13:48 UTC (rev 440)
+++ Mercury2/src/MercuryNode.cpp 2009-07-26 02:52:54 UTC (rev 441)
@@ -141,11 +141,8 @@
{
if ( IsHidden() ) return;
- MercuryMatrix matrix = FindGlobalMatrix();
- MercuryMatrix modelView = ManipulateMatrix( matrix );
+ const MercuryMatrix& matrix = FindGlobalMatrix();
- glLoadMatrix( modelView );
-
PreRender( matrix ); //calls on children assets
for (MercuryNode* child = FirstChild(); child != NULL; child = NextChild(child))
@@ -156,17 +153,21 @@
{
if ( IsHidden() || m_occlusionResult.IsOccluded() || IsCulled() ) return;
- MercuryMatrix matrix = FindGlobalMatrix();
- MercuryMatrix modelView = ManipulateMatrix( matrix );
-// if ( IsHidden() || IsCulled(modelView) ) return;
+ const MercuryMatrix& matrix = FindGlobalMatrix();
+ const MercuryMatrix& modelView = FindModelViewMatrix(); //get the one computed in the last transform
+
+ //A lot of this stuff could be moved into the transform node, BUT
+ //the alpha render path requires that all things things happen, so
+ //it is just easier to leave it here than to duplicate this code in
+ //RenderGraph::RenderAlpha
glLoadMatrix( modelView );
ShaderAttribute sa;
sa.type = ShaderAttribute::TYPE_MATRIX;
sa.value.matrix = matrix.Ptr();
Shader::SetAttribute("HG_ModelMatrix", sa);
-
+
Render( modelView ); //calls on children assets
//call render on other render graph entries under me
@@ -266,6 +267,20 @@
return MercuryMatrix::Identity();
}
+const MercuryMatrix& MercuryNode::FindModelViewMatrix() const
+{
+ const MercuryNode* n = NULL;
+ const TransformNode* tn;
+ for (n = this; n; n = n->Parent())
+ {
+ tn = TransformNode::Cast(n);
+ if ( tn )
+ return tn->GetModelViewMatrix();
+ }
+
+ return MercuryMatrix::Identity();
+}
+
void MercuryNode::AddPreRender(MercuryAsset* asset)
{
#ifdef MCHECKASSETS
Modified: Mercury2/src/MercuryNode.h
===================================================================
--- Mercury2/src/MercuryNode.h 2009-07-26 02:13:48 UTC (rev 440)
+++ Mercury2/src/MercuryNode.h 2009-07-26 02:52:54 UTC (rev 441)
@@ -57,8 +57,8 @@
void ThreadedUpdate(float dTime);
- void RecursivePreRender();
- void RecursiveRender();
+ virtual void RecursivePreRender();
+ virtual void RecursiveRender();
///Run on parent when a child is added
virtual void OnAddChild() {};
@@ -93,6 +93,7 @@
///This will get the world space matrix
const MercuryMatrix& FindGlobalMatrix() const;
+ const MercuryMatrix& FindModelViewMatrix() const;
virtual bool IsCulled(const MercuryMatrix& matrix);
inline bool IsHidden() { return m_hidden; }
Modified: Mercury2/src/TransformNode.cpp
===================================================================
--- Mercury2/src/TransformNode.cpp 2009-07-26 02:13:48 UTC (rev 440)
+++ Mercury2/src/TransformNode.cpp 2009-07-26 02:52:54 UTC (rev 441)
@@ -1,4 +1,6 @@
#include <TransformNode.h>
+#include <GLHeaders.h>
+#include <Shader.h>
REGISTER_NODE_TYPE(TransformNode);
REGISTER_NODE_TYPE(RotatorNode);
@@ -14,6 +16,18 @@
if (m_tainted) ComputeMatrix();
}
+void TransformNode::RecursivePreRender()
+{
+ if ( IsHidden() ) return;
+
+ const MercuryMatrix& matrix = FindGlobalMatrix();
+ m_modelView = ManipulateMatrix( matrix );
+
+ glLoadMatrix( m_modelView );
+
+ MercuryNode::RecursivePreRender();
+}
+
void TransformNode::SetScale( const MercuryVertex& scale )
{
if (scale != m_scale)
Modified: Mercury2/src/TransformNode.h
===================================================================
--- Mercury2/src/TransformNode.h 2009-07-26 02:13:48 UTC (rev 440)
+++ Mercury2/src/TransformNode.h 2009-07-26 02:52:54 UTC (rev 441)
@@ -25,6 +25,7 @@
// inline const MercuryMatrix& GetGlobalMatrix() const { return m_globalMatrix; }
virtual const MercuryMatrix& GetGlobalMatrix() const;
+ inline const MercuryMatrix& GetModelViewMatrix() const { return m_modelView; }
const MercuryMatrix& GetParentMatrix() const;
void SetTaint(bool taint);
@@ -34,6 +35,8 @@
virtual void LoadFromXML(const XMLNode& node);
virtual void OnAdded();
+
+ virtual void RecursivePreRender();
GENRTTI(TransformNode);
@@ -47,7 +50,7 @@
// MercuryMatrix m_localMatrix;
protected:
-
+ MercuryMatrix m_modelView;
MercuryMatrix m_globalMatrix;
bool m_tainted;
Modified: Mercury2/src/Viewport.h
===================================================================
--- Mercury2/src/Viewport.h 2009-07-26 02:13:48 UTC (rev 440)
+++ Mercury2/src/Viewport.h 2009-07-26 02:52:54 UTC (rev 441)
@@ -13,6 +13,7 @@
Viewport();
virtual void PreRender(const MercuryMatrix& matrix);
virtual void Render(const MercuryMatrix& matrix);
+ virtual void PostRender(const MercuryMatrix& matrix);
virtual void LoadFromXML(const XMLNode& node);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-07-26 02:13:55
|
Revision: 440
http://hgengine.svn.sourceforge.net/hgengine/?rev=440&view=rev
Author: axlecrusher
Date: 2009-07-26 02:13:48 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
move to viewport
Modified Paths:
--------------
Mercury2/src/Mercury2.cpp
Modified: Mercury2/src/Mercury2.cpp
===================================================================
--- Mercury2/src/Mercury2.cpp 2009-07-26 02:13:15 UTC (rev 439)
+++ Mercury2/src/Mercury2.cpp 2009-07-26 02:13:48 UTC (rev 440)
@@ -90,7 +90,7 @@
// printf("\n");
root->RecursivePreRender();
root->RecursiveRender();
- renderGraph.RenderAlpha();
+// renderGraph.RenderAlpha();
w->SwapBuffers();
++m_count;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-07-26 02:13:26
|
Revision: 439
http://hgengine.svn.sourceforge.net/hgengine/?rev=439&view=rev
Author: axlecrusher
Date: 2009-07-26 02:13:15 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
alpha path
Modified Paths:
--------------
Mercury2/src/Viewport.cpp
Modified: Mercury2/src/Viewport.cpp
===================================================================
--- Mercury2/src/Viewport.cpp 2009-07-25 20:25:16 UTC (rev 438)
+++ Mercury2/src/Viewport.cpp 2009-07-26 02:13:15 UTC (rev 439)
@@ -8,6 +8,8 @@
MercuryVertex EYE;
MercuryVector LOOKAT;
+#include <RenderGraph.h>
+
Viewport::Viewport()
:m_xFactor(1), m_yFactor(0.5), m_minx(0), m_miny(0)
{
@@ -85,6 +87,16 @@
// m_frustum.LookAt(EYE, LOOKAT, MercuryVertex(0,1,0));
}
+void Viewport::PostRender(const MercuryMatrix& matrix)
+{
+ glPushMatrix();
+// glLoadIdentity();
+ glLoadMatrix( matrix );
+ CURRENTRENDERGRAPH->RenderAlpha();
+ glPopMatrix();
+ MercuryNode::PostRender(matrix);
+}
+
void Viewport::LoadFromXML(const XMLNode& node)
{
m_xFactor = StrToFloat(node.Attribute("xfactor"), 1.0f);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-07-25 20:25:23
|
Revision: 438
http://hgengine.svn.sourceforge.net/hgengine/?rev=438&view=rev
Author: axlecrusher
Date: 2009-07-25 20:25:16 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
orthographic is still broken, but we are getting closer
Modified Paths:
--------------
Mercury2/Themes/default/File/scenegraph.xml
Mercury2/adv_set.c
Mercury2/src/Camera.cpp
Mercury2/src/Camera.h
Mercury2/src/MercuryVBO.cpp
Mercury2/src/Orthographic.cpp
Mercury2/src/Orthographic.h
Mercury2/src/Viewport.cpp
Mercury2/src/Viewport.h
Modified: Mercury2/Themes/default/File/scenegraph.xml
===================================================================
--- Mercury2/Themes/default/File/scenegraph.xml 2009-07-25 20:09:25 UTC (rev 437)
+++ Mercury2/Themes/default/File/scenegraph.xml 2009-07-25 20:25:16 UTC (rev 438)
@@ -1,50 +1,44 @@
<SceneGraph name="root">
-<!-- <node type="cameranode" movx="6" movz="-5.5" movy="3" rotx="-45" roty="90">
- <node type="viewport" fov="45" aspect="1.3333" near="0.01" far="100"/>
- </node>
--->
- <node type="cameranode" movx="0" movz="0" movy="0" rotx="0" roty="0" rotz="0" name="camera">
- <node type="viewport" fov="45" aspect="1.3333" near="0.01" far="100" name="vp"/>
- </node>
-
- <node type="transformnode" movz="-5" >
- <node type="TextNode" text="test font 123 HELLO WORLD!!! WOOT!" font="FONT:testfont.hgfont" size=".01" width="300" alphaPath="true" alignment="FIT_FULL" />
- </node>
-<!-- <asset type="texture" file="screenFBO_0" dynamic="true"/>
- <asset type="fullscreenquad"/>
- <node type="mercuryfbo" width="640" height="480" depth="true" tnum="2" name="screenFBO" usescreensize="true">
- <asset type="shader" file="testShader"/>
---> <node type="transformnode" rotx="-90" movz="-10" movx="0" movy="-5">
- <asset type="texture" file="MODEL:map.png"/>
- <asset type="hgmdlmodel" file="MODEL:map.hgmdl" />
- </node>
- <node type="mercurynode" name="lampForest" >
- <node type="transformnode" movz="-5" movx="0" movy="0" name="lamprow" >
- <node type="mercurynode" name="lamp">
- <node type="transformnode" rotx="-90" >
- <asset type="texture" file="MODEL:lamp.png"/>
- <asset type="hgmdlmodel" file="MODEL:lampN.hgmdl" />
- </node>
- <node type="billboardnode" billboardaxis="0,1,0" spheremode="true" >
- <node type="transformnode" roty="180" scalex="0.1" scaley="0.1" alphaPath="true">
- <asset type="texture" file="GRAPHIC:flame.png"/>
- <asset type="quad"/>
+ <node type="viewport" fov="45" aspect="1.3333" near="0.01" far="100" name="vp">
+ <node type="cameranode" movx="0" movz="0" movy="0" rotx="0" roty="0" rotz="0" name="camera">
+ <node type="transformnode" movz="-5" >
+ <node type="TextNode" text="test font 123 HELLO WORLD!!! WOOT!" font="FONT:testfont.hgfont" size=".01" width="300" alphaPath="true" alignment="FIT_FULL" />
+ </node>
+ <node type="transformnode" rotx="-90" movz="-10" movx="0" movy="-5">
+ <asset type="texture" file="MODEL:map.png"/>
+ <asset type="hgmdlmodel" file="MODEL:map.hgmdl" />
+ </node>
+ <node type="mercurynode" name="lampForest" >
+ <node type="transformnode" movz="-5" movx="0" movy="0" name="lamprow" >
+ <node type="mercurynode" name="lamp">
+ <node type="transformnode" rotx="-90" >
+ <asset type="texture" file="MODEL:lamp.png"/>
+ <asset type="hgmdlmodel" file="MODEL:lampN.hgmdl" />
</node>
+ <node type="billboardnode" billboardaxis="0,1,0" spheremode="true" >
+ <node type="transformnode" roty="180" scalex="0.1" scaley="0.1" alphaPath="true">
+ <asset type="texture" file="GRAPHIC:flame.png"/>
+ <asset type="quad"/>
+ </node>
+ </node>
</node>
+ <node type="transformnode" movx="1" fallback="lamprow.lamp" />
+ <node type="transformnode" movx="2" fallback="lamprow.lamp" />
+ <node type="transformnode" movx="3" fallback="lamprow.lamp" />
+ <node type="transformnode" movx="-1" fallback="lamprow.lamp" />
+ <node type="transformnode" movx="-2" fallback="lamprow.lamp" />
+ <node type="transformnode" movx="-3" fallback="lamprow.lamp" />
</node>
- <node type="transformnode" movx="1" fallback="lamprow.lamp" />
- <node type="transformnode" movx="2" fallback="lamprow.lamp" />
- <node type="transformnode" movx="3" fallback="lamprow.lamp" />
- <node type="transformnode" movx="-1" fallback="lamprow.lamp" />
- <node type="transformnode" movx="-2" fallback="lamprow.lamp" />
- <node type="transformnode" movx="-3" fallback="lamprow.lamp" />
+ <node type="transformnode" movz="-6" fallback="lampForest.lamprow"/>
+ <node type="transformnode" movz="-7" fallback="lampForest.lamprow"/>
+ <node type="transformnode" movz="-8" fallback="lampForest.lamprow"/>
+ <node type="transformnode" movz="-9" fallback="lampForest.lamprow"/>
+ <node type="transformnode" movz="-4" fallback="lampForest.lamprow"/>
+ <node type="transformnode" movz="-3" fallback="lampForest.lamprow"/>
</node>
- <node type="transformnode" movz="-6" fallback="lampForest.lamprow"/>
- <node type="transformnode" movz="-7" fallback="lampForest.lamprow"/>
- <node type="transformnode" movz="-8" fallback="lampForest.lamprow"/>
- <node type="transformnode" movz="-9" fallback="lampForest.lamprow"/>
- <node type="transformnode" movz="-4" fallback="lampForest.lamprow"/>
- <node type="transformnode" movz="-3" fallback="lampForest.lamprow"/>
</node>
-<!-- </node> -->
+ </node>
+<!-- <node type="orthographic" left="0" right="1" top="0" bottom="1" near="-1" far="1">
+ <asset type="quad"/>
+ </node> -->
</SceneGraph>
Modified: Mercury2/adv_set.c
===================================================================
--- Mercury2/adv_set.c 2009-07-25 20:09:25 UTC (rev 437)
+++ Mercury2/adv_set.c 2009-07-25 20:25:16 UTC (rev 438)
@@ -13,7 +13,7 @@
src/MercuryPlane.cpp src/BoundingBox.cpp src/Shader.cpp src/RenderGraph.cpp src/Frustum.cpp \
src/Camera.cpp src/MercuryInput.cpp src/MQuaternion.cpp src/ModuleManager.cpp src/MercuryFBO.cpp \
src/GLHelpers.cpp src/FullscreenQuad.cpp src/MercuryNamedResource.cpp src/MercuryPrefs.cpp \
- src/MercuryTheme.cpp"
+ src/MercuryTheme.cpp src/Orthographic.cpp"
SOURCES="$SOURCES src/MercuryFileDriverDirect.cpp src/MercuryFileDriverMem.cpp \
src/MercuryFileDriverPacked.cpp src/MercuryFileDriverZipped.cpp"
Modified: Mercury2/src/Camera.cpp
===================================================================
--- Mercury2/src/Camera.cpp 2009-07-25 20:09:25 UTC (rev 437)
+++ Mercury2/src/Camera.cpp 2009-07-25 20:25:16 UTC (rev 438)
@@ -12,6 +12,18 @@
REGISTER_FOR_MESSAGE( INPUTEVENT_MOUSE );
}
+void CameraNode::PreRender(const MercuryMatrix& matrix)
+{
+ VIEWMATRIX = m_viewMatrix;
+ TransformNode::PreRender(matrix);
+}
+
+void CameraNode::Render(const MercuryMatrix& matrix)
+{
+ VIEWMATRIX = m_viewMatrix;
+ TransformNode::Render(matrix);
+}
+
void CameraNode::ComputeMatrix()
{
m_tainted = false;
@@ -33,7 +45,7 @@
local.Translate( GetPosition()*-1 );
// m_globalMatrix = local * parent; //fold in any parent transform in reverse (correct rotation)
- VIEWMATRIX = local * parent;
+ m_viewMatrix = local * parent;
//compute camera position in world space (broken if camera is in transform node)
local = MercuryMatrix::Identity();
Modified: Mercury2/src/Camera.h
===================================================================
--- Mercury2/src/Camera.h 2009-07-25 20:09:25 UTC (rev 437)
+++ Mercury2/src/Camera.h 2009-07-25 20:25:16 UTC (rev 438)
@@ -11,11 +11,14 @@
virtual void ComputeMatrix();
virtual void HandleMessage(const MString& message, const MessageData* data);
virtual void Update(float dTime);
+ virtual void PreRender(const MercuryMatrix& matrix);
+ virtual void Render(const MercuryMatrix& matrix);
GENRTTI(CameraNode);
private:
MercuryVector m_lookAt;
float m_x, m_y;
+ MercuryMatrix m_viewMatrix;
};
#endif
Modified: Mercury2/src/MercuryVBO.cpp
===================================================================
--- Mercury2/src/MercuryVBO.cpp 2009-07-25 20:09:25 UTC (rev 437)
+++ Mercury2/src/MercuryVBO.cpp 2009-07-25 20:25:16 UTC (rev 438)
@@ -29,7 +29,6 @@
uint16_t stride = sizeof(float)*8;
if ( !m_initiated ) InitVBO();
-glDisable(GL_CULL_FACE);
if ( this != m_lastVBOrendered )
{
Modified: Mercury2/src/Orthographic.cpp
===================================================================
--- Mercury2/src/Orthographic.cpp 2009-07-25 20:09:25 UTC (rev 437)
+++ Mercury2/src/Orthographic.cpp 2009-07-25 20:25:16 UTC (rev 438)
@@ -18,8 +18,22 @@
glMatrixMode(GL_MODELVIEW);
VIEWMATRIX = matrix;
+ MercuryNode::PreRender(matrix);
}
+void Orthographic::Render(const MercuryMatrix& matrix)
+{
+ FRUSTUM = &m_frustum;
+
+ //Load the frustum into the projection
+ glMatrixMode(GL_PROJECTION);
+ glLoadMatrix( m_frustum.GetMatrix() );
+ glMatrixMode(GL_MODELVIEW);
+
+ VIEWMATRIX = matrix;
+ MercuryNode::Render(matrix);
+}
+
void Orthographic::LoadFromXML(const XMLNode& node)
{
MercuryWindow* w = MercuryWindow::GetCurrentWindow();
Modified: Mercury2/src/Orthographic.h
===================================================================
--- Mercury2/src/Orthographic.h 2009-07-25 20:09:25 UTC (rev 437)
+++ Mercury2/src/Orthographic.h 2009-07-25 20:25:16 UTC (rev 438)
@@ -12,6 +12,7 @@
public:
Orthographic();
virtual void PreRender(const MercuryMatrix& matrix);
+ virtual void Render(const MercuryMatrix& matrix);
virtual void LoadFromXML(const XMLNode& node);
Modified: Mercury2/src/Viewport.cpp
===================================================================
--- Mercury2/src/Viewport.cpp 2009-07-25 20:09:25 UTC (rev 437)
+++ Mercury2/src/Viewport.cpp 2009-07-25 20:25:16 UTC (rev 438)
@@ -49,6 +49,42 @@
m_frustum.LookAt(EYE, LOOKAT, MercuryVertex(0,1,0));
}
+void Viewport::Render(const MercuryMatrix& matrix)
+{
+ FRUSTUM = &m_frustum;
+
+ MercuryWindow* w = MercuryWindow::GetCurrentWindow();
+ glViewport(m_minx, m_miny, (GLsizei)(w->Width()*m_xFactor), (GLsizei)(w->Height()*m_yFactor));
+
+ //Load the frustum into the projection
+ //"eye" position does not go into projection
+ glMatrixMode(GL_PROJECTION);
+ glLoadMatrix( m_frustum.GetMatrix() );
+
+ glMatrixMode(GL_MODELVIEW);
+
+ //compute the position of the eye
+// EYE = MercuryVertex(0,0,0,1); //wrong
+// EYE = matrix * EYE;
+
+// VIEWMATRIX = matrix;
+
+ //the camera sets this (the calculation here is wrong)
+// MercuryVector z(0,0,-1); //look down Z by default
+// LOOKAT = (matrix * z).Normalize();
+
+// matrix.Print();
+// EYE.Print("Eye");
+// LOOKAT.Print("Lookat");
+// printf("******\n");
+// LOOKAT = (matrix * l).Normalize();
+// LOOKAT.
+// LOOKAT.Print();
+
+ //Sets up the clipping frustum
+// m_frustum.LookAt(EYE, LOOKAT, MercuryVertex(0,1,0));
+}
+
void Viewport::LoadFromXML(const XMLNode& node)
{
m_xFactor = StrToFloat(node.Attribute("xfactor"), 1.0f);
Modified: Mercury2/src/Viewport.h
===================================================================
--- Mercury2/src/Viewport.h 2009-07-25 20:09:25 UTC (rev 437)
+++ Mercury2/src/Viewport.h 2009-07-25 20:25:16 UTC (rev 438)
@@ -12,6 +12,7 @@
public:
Viewport();
virtual void PreRender(const MercuryMatrix& matrix);
+ virtual void Render(const MercuryMatrix& matrix);
virtual void LoadFromXML(const XMLNode& node);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-07-25 20:09:32
|
Revision: 437
http://hgengine.svn.sourceforge.net/hgengine/?rev=437&view=rev
Author: axlecrusher
Date: 2009-07-25 20:09:25 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
clean up orthographic
Modified Paths:
--------------
Mercury2/src/Orthographic.cpp
Modified: Mercury2/src/Orthographic.cpp
===================================================================
--- Mercury2/src/Orthographic.cpp 2009-07-25 18:58:42 UTC (rev 436)
+++ Mercury2/src/Orthographic.cpp 2009-07-25 20:09:25 UTC (rev 437)
@@ -12,35 +12,12 @@
{
FRUSTUM = &m_frustum;
- MercuryWindow* w = MercuryWindow::GetCurrentWindow();
-
//Load the frustum into the projection
- //"eye" position does not go into projection
glMatrixMode(GL_PROJECTION);
glLoadMatrix( m_frustum.GetMatrix() );
- m_frustum.GetMatrix().Print();
glMatrixMode(GL_MODELVIEW);
- //compute the position of the eye
-// EYE = MercuryVertex(0,0,0,1); //wrong
-// EYE = matrix * EYE;
-
VIEWMATRIX = matrix;
-
- //the camera sets this (the calculation here is wrong)
-// MercuryVector z(0,0,-1); //look down Z by default
-// LOOKAT = (matrix * z).Normalize();
-
-// matrix.Print();
-// EYE.Print("Eye");
-// LOOKAT.Print("Lookat");
-// printf("******\n");
-// LOOKAT = (matrix * l).Normalize();
-// LOOKAT.
-// LOOKAT.Print();
-
- //Sets up the clipping frustum
-// m_frustum.LookAt(EYE, LOOKAT, MercuryVertex(0,1,0));
}
void Orthographic::LoadFromXML(const XMLNode& node)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-07-25 18:58:50
|
Revision: 436
http://hgengine.svn.sourceforge.net/hgengine/?rev=436&view=rev
Author: axlecrusher
Date: 2009-07-25 18:58:42 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
camera and frustum go into viewmatrix
Modified Paths:
--------------
Mercury2/src/Camera.cpp
Mercury2/src/Viewport.cpp
Modified: Mercury2/src/Camera.cpp
===================================================================
--- Mercury2/src/Camera.cpp 2009-07-25 18:33:03 UTC (rev 435)
+++ Mercury2/src/Camera.cpp 2009-07-25 18:58:42 UTC (rev 436)
@@ -32,7 +32,8 @@
r.toMatrix4( local );
local.Translate( GetPosition()*-1 );
- m_globalMatrix = local * parent; //fold in any parent transform in reverse (correct rotation)
+// m_globalMatrix = local * parent; //fold in any parent transform in reverse (correct rotation)
+ VIEWMATRIX = local * parent;
//compute camera position in world space (broken if camera is in transform node)
local = MercuryMatrix::Identity();
Modified: Mercury2/src/Viewport.cpp
===================================================================
--- Mercury2/src/Viewport.cpp 2009-07-25 18:33:03 UTC (rev 435)
+++ Mercury2/src/Viewport.cpp 2009-07-25 18:58:42 UTC (rev 436)
@@ -31,7 +31,7 @@
// EYE = MercuryVertex(0,0,0,1); //wrong
// EYE = matrix * EYE;
- VIEWMATRIX = matrix;
+// VIEWMATRIX = matrix;
//the camera sets this (the calculation here is wrong)
// MercuryVector z(0,0,-1); //look down Z by default
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-07-25 18:33:11
|
Revision: 435
http://hgengine.svn.sourceforge.net/hgengine/?rev=435&view=rev
Author: cnlohr
Date: 2009-07-25 18:33:03 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
initialize variables
Modified Paths:
--------------
Mercury2/src/MercuryFileDriverDirect.cpp
Modified: Mercury2/src/MercuryFileDriverDirect.cpp
===================================================================
--- Mercury2/src/MercuryFileDriverDirect.cpp 2009-07-25 18:31:55 UTC (rev 434)
+++ Mercury2/src/MercuryFileDriverDirect.cpp 2009-07-25 18:33:03 UTC (rev 435)
@@ -40,7 +40,7 @@
bool MercuryFile::ReadLine( MString & data )
{
data = "";
- char b1[1];
+ char b1[1] = { 0 };
bool Success;
while ( ( Success = ( Read( b1, 1 ) > 0 ) ) )
{
@@ -223,6 +223,7 @@
}
#else
char buffer[PATH_MAX];
+ memset( buffer, 0, PATH_MAX );
char * path_end;
if( readlink( "/proc/self/exe", buffer, PATH_MAX ) <= 0 )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-07-25 18:32:03
|
Revision: 434
http://hgengine.svn.sourceforge.net/hgengine/?rev=434&view=rev
Author: axlecrusher
Date: 2009-07-25 18:31:55 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
fix ripple taint down
Modified Paths:
--------------
Mercury2/src/TransformNode.cpp
Mercury2/src/TransformNode.h
Modified: Mercury2/src/TransformNode.cpp
===================================================================
--- Mercury2/src/TransformNode.cpp 2009-07-23 03:50:09 UTC (rev 433)
+++ Mercury2/src/TransformNode.cpp 2009-07-25 18:31:55 UTC (rev 434)
@@ -44,7 +44,7 @@
void TransformNode::SetTaint(bool taint)
{
m_tainted = taint;
- RippleTaintDown();
+ RippleTaintDown(this);
}
void TransformNode::ComputeMatrix()
@@ -81,19 +81,18 @@
return MercuryMatrix::Identity();
}
-void TransformNode::RippleTaintDown()
+void TransformNode::RippleTaintDown(MercuryNode* node)
{
- if (m_tainted == true)
+ TransformNode* tn;
+
+ for (MercuryNode* n = node->FirstChild(); n != NULL; n = node->NextChild(n))
{
- TransformNode* tn;
- std::list< MercuryNode* >::iterator i;
-
- for (i = m_children.begin(); i != m_children.end(); ++i )
- {
- tn = TransformNode::Cast(*i);
- if ( tn )
- tn->SetTaint( true );
- }
+ tn = TransformNode::Cast(n);
+ if (tn)
+ //stop this recursion here on this branch SetTaint will start a new taint recursion
+ tn->SetTaint(true);
+ else
+ RippleTaintDown( n );
}
}
@@ -147,7 +146,7 @@
tn = TransformNode::Cast( n );
if ( tn )
{
- tn->RippleTaintDown();
+ RippleTaintDown(tn);
return;
}
n = n->Parent();
Modified: Mercury2/src/TransformNode.h
===================================================================
--- Mercury2/src/TransformNode.h 2009-07-23 03:50:09 UTC (rev 433)
+++ Mercury2/src/TransformNode.h 2009-07-25 18:31:55 UTC (rev 434)
@@ -38,7 +38,7 @@
GENRTTI(TransformNode);
private:
- void RippleTaintDown();
+ static void RippleTaintDown(MercuryNode* n);
//use of accessor required
MercuryVertex m_scale;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-07-23 03:50:12
|
Revision: 433
http://hgengine.svn.sourceforge.net/hgengine/?rev=433&view=rev
Author: cnlohr
Date: 2009-07-23 03:50:09 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
Update windows project, fixing some 64-bit compat issues.
Modified Paths:
--------------
Mercury2/Mercury2.vcproj
Mercury2/modules/TextNode.cpp
Mercury2/src/GLHelpers.cpp
Mercury2/src/MercuryFile.cpp
Mercury2/src/MercuryFileDriverDirect.cpp
Mercury2/src/MercuryMath.h
Mercury2/src/MercuryNamedResource.cpp
Modified: Mercury2/Mercury2.vcproj
===================================================================
--- Mercury2/Mercury2.vcproj 2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/Mercury2.vcproj 2009-07-23 03:50:09 UTC (rev 433)
@@ -6,6 +6,7 @@
ProjectGUID="{071CC088-86A7-4A9F-9FEE-50BD69132886}"
RootNamespace="Mercury2"
Keyword="Win32Proj"
+ TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@@ -41,13 +42,12 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;src;src/include;src/include/png;src/include/zlib"
- PreprocessorDefinitions="HGENGINE,WIN32"
+ PreprocessorDefinitions="HGENGINE;WIN32;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -86,9 +86,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -118,11 +115,10 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".;src;src/include;src/include/png;src/include/zlib"
- PreprocessorDefinitions="HGENGINE,WIN32"
+ PreprocessorDefinitions="HGENGINE;WIN32;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -163,9 +159,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -283,10 +276,6 @@
>
</File>
<File
- RelativePath=".\src\MercuryPoint.cpp"
- >
- </File>
- <File
RelativePath=".\src\MercuryPrefs.cpp"
>
</File>
@@ -517,10 +506,6 @@
>
</File>
<File
- RelativePath=".\src\MercuryPoint.h"
- >
- </File>
- <File
RelativePath=".\src\MercuryPrefs.h"
>
</File>
Modified: Mercury2/modules/TextNode.cpp
===================================================================
--- Mercury2/modules/TextNode.cpp 2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/modules/TextNode.cpp 2009-07-23 03:50:09 UTC (rev 433)
@@ -242,8 +242,8 @@
}
//Stage 3: Actually generate the geometry.
- ((MercuryVBO*)m_kVBO.Ptr())->AllocateIndexSpace(chars.size()*6);
- ((MercuryVBO*)m_kVBO.Ptr())->AllocateVertexSpace(chars.size()*4);
+ ((MercuryVBO*)m_kVBO.Ptr())->AllocateIndexSpace((unsigned)chars.size()*6);
+ ((MercuryVBO*)m_kVBO.Ptr())->AllocateVertexSpace((unsigned)chars.size()*4);
for( unsigned i = 0; i < chars.size(); i++ )
{
Modified: Mercury2/src/GLHelpers.cpp
===================================================================
--- Mercury2/src/GLHelpers.cpp 2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/src/GLHelpers.cpp 2009-07-23 03:50:09 UTC (rev 433)
@@ -75,7 +75,7 @@
winX, winY, winZ,
modelview, projection, viewport,
&mouseX, &mouseY, &mouseZ);
- return MercuryVertex( mouseX, mouseY, mouseZ );
+ return MercuryVertex( (float)mouseX, (float)mouseY, (float)mouseZ );
}
/****************************************************************************
Modified: Mercury2/src/MercuryFile.cpp
===================================================================
--- Mercury2/src/MercuryFile.cpp 2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/src/MercuryFile.cpp 2009-07-23 03:50:09 UTC (rev 433)
@@ -60,7 +60,7 @@
if( *c == ':' )
{
c++;
- MString ExtString = ToProper( MString( sPath.c_str(), c-sPath.c_str()-1 ) ) + "/" + c;
+ MString ExtString = ToProper( MString( sPath.c_str(), (int)(c-sPath.c_str()-1) ) ) + "/" + c;
const MVector< MercuryThemeManager::Theme > & th = THEME.GetThemes();
for( int i = (int)th.size()-1; i >= 0; i-- )
{
Modified: Mercury2/src/MercuryFileDriverDirect.cpp
===================================================================
--- Mercury2/src/MercuryFileDriverDirect.cpp 2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/src/MercuryFileDriverDirect.cpp 2009-07-23 03:50:09 UTC (rev 433)
@@ -150,7 +150,7 @@
{
if ( m_fF == NULL )
return false;
- return ( fread( data, 1, length, m_fF) );
+ return (unsigned long)( fread( data, 1, length, m_fF) );
}
bool MercuryFileObjectDirect::Check()
Modified: Mercury2/src/MercuryMath.h
===================================================================
--- Mercury2/src/MercuryMath.h 2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/src/MercuryMath.h 2009-07-23 03:50:09 UTC (rev 433)
@@ -13,9 +13,10 @@
#ifdef WIN32
#include <limits>
#define INFINITY (std::numeric_limits<float>::infinity())
+#else
+#define MAXINT (0x7FFFFFFF)
#endif
-#define MAXINT (0x7FFFFFFF)
void ZeroFloatRow(FloatRow& r);
Modified: Mercury2/src/MercuryNamedResource.cpp
===================================================================
--- Mercury2/src/MercuryNamedResource.cpp 2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/src/MercuryNamedResource.cpp 2009-07-23 03:50:09 UTC (rev 433)
@@ -56,7 +56,7 @@
if( tmpret.compare( "YES" ) == 0 ) return 1;
if( tmpret.compare( "NO" ) == 0 ) return 0;
- return StrToInt( tmpret );
+ return StrToInt( tmpret ) != 0;
}
if( bSetValue )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-07-21 01:52:42
|
Revision: 432
http://hgengine.svn.sourceforge.net/hgengine/?rev=432&view=rev
Author: axlecrusher
Date: 2009-07-21 01:52:34 +0000 (Tue, 21 Jul 2009)
Log Message:
-----------
update
Modified Paths:
--------------
Mercury2/src/Frustum.cpp
Mercury2/src/Frustum.h
Mercury2/src/MercuryVBO.cpp
Mercury2/src/Viewport.h
Added Paths:
-----------
Mercury2/src/Orthographic.cpp
Mercury2/src/Orthographic.h
Modified: Mercury2/src/Frustum.cpp
===================================================================
--- Mercury2/src/Frustum.cpp 2009-07-21 00:48:39 UTC (rev 431)
+++ Mercury2/src/Frustum.cpp 2009-07-21 01:52:34 UTC (rev 432)
@@ -91,6 +91,32 @@
m_planes[PRIGHT].Setup(m_nc+X*m_nw,normal);
}
+void Frustum::Ortho(float left, float right, float bottom, float top, float near, float far)
+{
+ float rml = right - left;
+ float tmb = top - bottom;
+ float fmn = far - near;
+
+ m_frustum = MercuryMatrix::Identity();
+ m_frustum[0][0] = 2.0f/rml;
+ m_frustum[1][1] = 2.0f/tmb;
+ m_frustum[2][2] = 2.0f/fmn;
+
+ m_frustum[0][3] = -(right+left)/rml;
+ m_frustum[1][3] = -(top+bottom)/tmb;
+ m_frustum[2][3] = -(far+near)/fmn;
+
+ m_planes[PTOP].Setup(MercuryVertex(rml/2.0f, top, fmn/2.0f), MercuryVector(0,-1,0));
+ m_planes[PBOTTOM].Setup(MercuryVertex(rml/2.0f, bottom, fmn/2.0f), MercuryVector(0,1,0));
+
+ m_planes[PLEFT].Setup(MercuryVertex(left, tmb/2.0f, fmn/2.0f), MercuryVector(1,0,0));
+ m_planes[PRIGHT].Setup(MercuryVertex(right, tmb/2.0f, fmn/2.0f), MercuryVector(-1,0,0));
+
+ m_planes[PNEAR].Setup(MercuryVertex(rml/2.0f, tmb/2.0f, near), MercuryVector(0,0,-1));
+ m_planes[PFAR].Setup(MercuryVertex(rml/2.0f, tmb/2.0f, far), MercuryVector(0,0,1));
+}
+
+
/*
void Frustum::LookAt()
{
Modified: Mercury2/src/Frustum.h
===================================================================
--- Mercury2/src/Frustum.h 2009-07-21 00:48:39 UTC (rev 431)
+++ Mercury2/src/Frustum.h 2009-07-21 01:52:34 UTC (rev 432)
@@ -22,6 +22,7 @@
const MercuryMatrix& GetMatrix() const { return m_frustum; }
void ComputeFrustum(float left, float right, float bottom, float top, float zNear, float zFar);
void LookAt(const MercuryVertex& eye, const MercuryVector& look, const MercuryVector& up);
+ void Ortho(float left, float right, float bottom, float top, float near, float far);
inline const MercuryPlane& GetPlane(int i) const { return m_planes[i]; }
private:
@@ -35,6 +36,11 @@
MercuryVector m_nc, m_fc;
};
+extern const Frustum* FRUSTUM;
+extern MercuryMatrix VIEWMATRIX;
+extern MercuryVertex EYE;
+extern MercuryVector LOOKAT;
+
#endif
/****************************************************************************
Modified: Mercury2/src/MercuryVBO.cpp
===================================================================
--- Mercury2/src/MercuryVBO.cpp 2009-07-21 00:48:39 UTC (rev 431)
+++ Mercury2/src/MercuryVBO.cpp 2009-07-21 01:52:34 UTC (rev 432)
@@ -28,8 +28,8 @@
uint8_t numTextures = Texture::NumberActiveTextures();
uint16_t stride = sizeof(float)*8;
- if ( !m_initiated )
- InitVBO();
+ if ( !m_initiated ) InitVBO();
+glDisable(GL_CULL_FACE);
if ( this != m_lastVBOrendered )
{
Added: Mercury2/src/Orthographic.cpp
===================================================================
--- Mercury2/src/Orthographic.cpp (rev 0)
+++ Mercury2/src/Orthographic.cpp 2009-07-21 01:52:34 UTC (rev 432)
@@ -0,0 +1,90 @@
+#include <Orthographic.h>
+#include <GLHeaders.h>
+#include <MercuryWindow.h>
+
+REGISTER_NODE_TYPE(Orthographic);
+
+Orthographic::Orthographic()
+{
+}
+
+void Orthographic::PreRender(const MercuryMatrix& matrix)
+{
+ FRUSTUM = &m_frustum;
+
+ MercuryWindow* w = MercuryWindow::GetCurrentWindow();
+
+ //Load the frustum into the projection
+ //"eye" position does not go into projection
+ glMatrixMode(GL_PROJECTION);
+ glLoadMatrix( m_frustum.GetMatrix() );
+ m_frustum.GetMatrix().Print();
+ glMatrixMode(GL_MODELVIEW);
+
+ //compute the position of the eye
+// EYE = MercuryVertex(0,0,0,1); //wrong
+// EYE = matrix * EYE;
+
+ VIEWMATRIX = matrix;
+
+ //the camera sets this (the calculation here is wrong)
+// MercuryVector z(0,0,-1); //look down Z by default
+// LOOKAT = (matrix * z).Normalize();
+
+// matrix.Print();
+// EYE.Print("Eye");
+// LOOKAT.Print("Lookat");
+// printf("******\n");
+// LOOKAT = (matrix * l).Normalize();
+// LOOKAT.
+// LOOKAT.Print();
+
+ //Sets up the clipping frustum
+// m_frustum.LookAt(EYE, LOOKAT, MercuryVertex(0,1,0));
+}
+
+void Orthographic::LoadFromXML(const XMLNode& node)
+{
+ MercuryWindow* w = MercuryWindow::GetCurrentWindow();
+
+ m_frustum.Ortho( StrToFloat(node.Attribute("left")),
+ StrToFloat(node.Attribute("right")),
+ StrToFloat(node.Attribute("bottom")),
+ StrToFloat(node.Attribute("top")),
+ StrToFloat(node.Attribute("near")),
+ StrToFloat(node.Attribute("far")) );
+
+ MercuryNode::LoadFromXML(node);
+}
+
+/****************************************************************************
+ * Copyright (C) 2009 by Joshua Allen *
+ * *
+ * *
+ * All rights reserved. *
+ * *
+ * Redistribution and use in source and binary forms, with or without *
+ * modification, are permitted provided that the following conditions *
+ * are met: *
+ * * Redistributions of source code must retain the above copyright *
+ * notice, this list of conditions and the following disclaimer. *
+ * * Redistributions in binary form must reproduce the above *
+ * copyright notice, this list of conditions and the following *
+ * disclaimer in the documentation and/or other materials provided *
+ * with the distribution. *
+ * * Neither the name of the Mercury Engine nor the names of its *
+ * contributors may be used to endorse or promote products derived *
+ * from this software without specific prior written permission. *
+ * *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT *
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR *
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT *
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, *
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT *
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE *
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
+ ***************************************************************************/
Added: Mercury2/src/Orthographic.h
===================================================================
--- Mercury2/src/Orthographic.h (rev 0)
+++ Mercury2/src/Orthographic.h 2009-07-21 01:52:34 UTC (rev 432)
@@ -0,0 +1,56 @@
+#ifndef ORTHOGRAPHIC_H
+#define ORTHOGRAPHIC_H
+
+#include <MercuryNode.h>
+#include <MercuryMatrix.h>
+#include <MercuryVertex.h>
+#include <MercuryPlane.h>
+#include <Frustum.h>
+
+class Orthographic : public MercuryNode
+{
+ public:
+ Orthographic();
+ virtual void PreRender(const MercuryMatrix& matrix);
+
+ virtual void LoadFromXML(const XMLNode& node);
+
+ GENRTTI(Orthographic);
+ private:
+ Frustum m_frustum;
+// float m_xFactor, m_yFactor;
+// int m_minx, m_miny;
+};
+
+#endif
+/****************************************************************************
+ * Copyright (C) 2009 by Joshua Allen *
+ * *
+ * *
+ * All rights reserved. *
+ * *
+ * Redistribution and use in source and binary forms, with or without *
+ * modification, are permitted provided that the following conditions *
+ * are met: *
+ * * Redistributions of source code must retain the above copyright *
+ * notice, this list of conditions and the following disclaimer. *
+ * * Redistributions in binary form must reproduce the above *
+ * copyright notice, this list of conditions and the following *
+ * disclaimer in the documentation and/or other materials provided *
+ * with the distribution. *
+ * * Neither the name of the Mercury Engine nor the names of its *
+ * contributors may be used to endorse or promote products derived *
+ * from this software without specific prior written permission. *
+ * *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT *
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR *
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT *
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, *
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT *
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE *
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
+ ***************************************************************************/
Modified: Mercury2/src/Viewport.h
===================================================================
--- Mercury2/src/Viewport.h 2009-07-21 00:48:39 UTC (rev 431)
+++ Mercury2/src/Viewport.h 2009-07-21 01:52:34 UTC (rev 432)
@@ -7,11 +7,6 @@
#include <MercuryPlane.h>
#include <Frustum.h>
-extern const Frustum* FRUSTUM;
-extern MercuryMatrix VIEWMATRIX;
-extern MercuryVertex EYE;
-extern MercuryVector LOOKAT;
-
class Viewport : public MercuryNode
{
public:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-07-21 00:48:40
|
Revision: 431
http://hgengine.svn.sourceforge.net/hgengine/?rev=431&view=rev
Author: cnlohr
Date: 2009-07-21 00:48:39 +0000 (Tue, 21 Jul 2009)
Log Message:
-----------
fix - forgot to include include
Modified Paths:
--------------
Mercury2/src/MercuryUtil.cpp
Modified: Mercury2/src/MercuryUtil.cpp
===================================================================
--- Mercury2/src/MercuryUtil.cpp 2009-07-21 00:45:11 UTC (rev 430)
+++ Mercury2/src/MercuryUtil.cpp 2009-07-21 00:48:39 UTC (rev 431)
@@ -2,6 +2,7 @@
#include <MercuryFile.h>
#include <Mint.h>
#include <MercuryVector.h>
+#include <MercuryBacktrace.h>
MString ToUpper(const MString& s)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-07-21 00:45:18
|
Revision: 430
http://hgengine.svn.sourceforge.net/hgengine/?rev=430&view=rev
Author: cnlohr
Date: 2009-07-21 00:45:11 +0000 (Tue, 21 Jul 2009)
Log Message:
-----------
Print backtrace on FAILs()
Modified Paths:
--------------
Mercury2/src/MercuryUtil.cpp
Modified: Mercury2/src/MercuryUtil.cpp
===================================================================
--- Mercury2/src/MercuryUtil.cpp 2009-07-16 05:05:11 UTC (rev 429)
+++ Mercury2/src/MercuryUtil.cpp 2009-07-21 00:45:11 UTC (rev 430)
@@ -74,8 +74,11 @@
void fail_m( const char * message, const char * file, int line )
{
+ char backtracebuffer[2048];
//Probably should message box here somewhere in the event we're running on Windows.
fprintf( stderr, "Fatal Error: \"%s\" in %s:%d\n", message, file, line );
+ cnget_backtrace( 1, backtracebuffer, 2047 );
+ puts( backtracebuffer );
exit(-1);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-07-16 05:05:15
|
Revision: 429
http://hgengine.svn.sourceforge.net/hgengine/?rev=429&view=rev
Author: cnlohr
Date: 2009-07-16 05:05:11 +0000 (Thu, 16 Jul 2009)
Log Message:
-----------
add ability for nodes to find a parent by name
Modified Paths:
--------------
Mercury2/src/MercuryNode.cpp
Mercury2/src/MercuryNode.h
Modified: Mercury2/src/MercuryNode.cpp
===================================================================
--- Mercury2/src/MercuryNode.cpp 2009-07-15 14:33:24 UTC (rev 428)
+++ Mercury2/src/MercuryNode.cpp 2009-07-16 05:05:11 UTC (rev 429)
@@ -120,7 +120,15 @@
return NULL;
}
+MercuryNode* MercuryNode::FindParent( const MString & sNameOfNode, int depth )
+{
+ MercuryNode * ret = this;
+ while( ret && ret->GetName() != sNameOfNode )
+ ret = ret->Parent();
+ return ret;
+}
+
void MercuryNode::RecursiveUpdate(float dTime)
{
Update(dTime);
Modified: Mercury2/src/MercuryNode.h
===================================================================
--- Mercury2/src/MercuryNode.h 2009-07-15 14:33:24 UTC (rev 428)
+++ Mercury2/src/MercuryNode.h 2009-07-16 05:05:11 UTC (rev 429)
@@ -48,6 +48,10 @@
/** The search order is breadth-first, however this may change without notice! */
MercuryNode* FindChild( const MString & sNameOfNode, int depth = MAXINT );
+ ///Find a parent node that has the name matching sNameOfNode.
+ /** Traversal is from the closest parent on upward */
+ MercuryNode* FindParent( const MString & sNameOfNode, int depth = MAXINT );
+
virtual void Update(float dTime) {};
virtual void RecursiveUpdate(float dTime);
void ThreadedUpdate(float dTime);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-07-15 14:33:27
|
Revision: 428
http://hgengine.svn.sourceforge.net/hgengine/?rev=428&view=rev
Author: cnlohr
Date: 2009-07-15 14:33:24 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
remove mercury point as per Josh's request... I don't really know what
it was doing here, anyway.
Removed Paths:
-------------
Mercury2/src/MercuryPoint.cpp
Mercury2/src/MercuryPoint.h
Deleted: Mercury2/src/MercuryPoint.cpp
===================================================================
--- Mercury2/src/MercuryPoint.cpp 2009-07-15 05:56:24 UTC (rev 427)
+++ Mercury2/src/MercuryPoint.cpp 2009-07-15 14:33:24 UTC (rev 428)
@@ -1,115 +0,0 @@
-#include <MercuryPoint.h>
-#include <MercuryMath.h>
-
-const float MercuryPoint::operator[] ( const int rhs ) const
-{
- switch (rhs)
- {
- case 0: return x;
- case 1: return y;
- case 2: return z;
- }
- return x; //haha we won't even get here.
-}
-
-float & MercuryPoint::operator [] ( const int rhs )
-{
- switch (rhs)
- {
- case 0: return x;
- case 1: return y;
- case 2: return z;
- }
- return x; //haha we won't even get here.
-}
-
-MercuryPoint MercuryPoint::operator*(const MercuryPoint& p) const
-{
- MercuryPoint tmp;
- tmp.x = x * p.x;
- tmp.y = y * p.y;
- tmp.z = z * p.z;
- return tmp;
-}
-
-MercuryPoint MercuryPoint::operator/(const MercuryPoint& p) const
-{
- MercuryPoint tmp;
- tmp.x = x / p.x;
- tmp.y = y / p.y;
- tmp.z = z / p.z;
- return tmp;
-}
-
-bool MercuryPoint::operator==(const MercuryPoint& p) const
-{
- if ((x == p.x) && (y == p.y) && (z == p.z))
- return true;
-
- return false;
-}
-
-bool MercuryPoint::operator==(const float f) const
-{
- if ((x == f) && (y == f) && (z == f))
- return true;
-
- return false;
-}
-
-MercuryPoint MercuryPoint::CrossProduct(const MercuryPoint& p) const
-{
- MercuryPoint ret;
-
- ret[0] = y*p.z - z*p.y;
- ret[1] = z*p.x - x*p.z;
- ret[2] = x*p.y - y*p.x;
-
- return ret;
-}
-
-void MercuryPoint::NormalizeSelf()
-{
- float imag = 1.0f/Magnitude();
- x *= imag; y *= imag; z *= imag;
-}
-
-const MercuryPoint MercuryPoint::Normalize() const
-{
- MercuryPoint t(*this);
- t.NormalizeSelf();
- return t;
-}
-
-float MercuryPoint::Magnitude() const
-{
- float length = 0;
- length += x*x;
- length += y*y;
- length += z*z;
- return SQRT(length);
-}
-
-/***************************************************************************
- * Copyright (C) 2008 by Joshua Allen, Charles Lohr *
- * *
- * *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: *
- * * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. *
- * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. *
- * * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT *
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR *
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR *
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, *
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, *
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR *
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF *
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING *
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS *
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- ***************************************************************************/
Deleted: Mercury2/src/MercuryPoint.h
===================================================================
--- Mercury2/src/MercuryPoint.h 2009-07-15 05:56:24 UTC (rev 427)
+++ Mercury2/src/MercuryPoint.h 2009-07-15 14:33:24 UTC (rev 428)
@@ -1,107 +0,0 @@
-#ifndef MERCURYPOINT_H
-#define MERCURYPOINT_H
-
-///A point in space/vector
-class MercuryPoint
-{
- public:
- MercuryPoint() : x(0), y(0), z(0) { };
- MercuryPoint( float ix, float iy, float iz ) : x(ix), y(iy), z(iz) { };
- MercuryPoint( const float * in ) : x(in[0]), y(in[1]), z(in[2]) { };
-
- ///Direct conversion to float*
- operator float* () { return &x; }
- ///Direct conversion to const float*
- operator const float* () const { return &x; }
-
- ///Get X value
- inline const float GetX() const { return x; }
- ///Get Y value
- inline const float GetY() const { return y; }
- ///Get Z value
- inline const float GetZ() const { return z; }
- ///Set X value
- inline bool SetX(const float ix) { if (ix == x) { return false; } x = ix; return true; }
- ///Set Y value
- inline bool SetY(const float iy) { if (iy == y) { return false; } y = iy; return true; }
- ///Set Z value
- inline bool SetZ(const float iz) { if (iz == z) { return false; } z = iz; return true; }
- ///Zero the vector
- inline void Clear() { x = 0; y = 0; z = 0; }
-
- //allow [] to access
- float & operator[] ( const int rhs );
- const float operator[] ( const int rhs ) const;
-
- ///Normalize (make |point| = 1)
- void NormalizeSelf();
- ///Return a normalized point
- const MercuryPoint Normalize() const;
- ///Return the magnitude of |this|
- float Magnitude() const;
-
- float GetBiggestElement() const { if( x > y ) return (x>z)?x:z; else return (y>z)?y:z; }
-
- ///Write out to be = to this point
- inline void ConvertToVector3( float* out ) const { out[0] = x; out[1] = y; out[2] = z; }
- ///Write out to be = to this point, however the 4th element will be 0
- inline void ConvertToVector4( float* out ) const { out[0] = x; out[1] = y; out[2] = z; out[3] = 0; }
- ///Write out to be = - to this point, however the 4th element will be 0
- inline void ConvertToIVector4( float* out ) const { out[0] = -x; out[1] = -y; out[2] = -z; out[3] = 0; }
-
- ///Component-wise multiply
- MercuryPoint operator*(const MercuryPoint& p) const;
- ///Component-wise divide
- MercuryPoint operator/(const MercuryPoint& p) const;
-
- inline MercuryPoint& operator += ( const MercuryPoint& other ) { x+=other.x; y+=other.y; z+=other.z; return *this; }
- inline MercuryPoint& operator -= ( const MercuryPoint& other ) { x-=other.x; y-=other.y; z-=other.z; return *this; }
- inline MercuryPoint& operator *= ( float f ) { x*=f; y*=f; z*=f; return *this; }
- inline MercuryPoint& operator /= ( float f ) { x/=f; y/=f; z/=f; return *this; }
-
- inline MercuryPoint operator + ( const MercuryPoint& other ) const { return MercuryPoint( x+other.x, y+other.y, z+other.z ); }
- inline MercuryPoint operator - ( const MercuryPoint& other ) const { return MercuryPoint( x-other.x, y-other.y, z-other.z ); }
- inline MercuryPoint operator * ( float f ) const { return MercuryPoint( x*f, y*f, z*f ); }
- inline MercuryPoint operator / ( float f ) const { return MercuryPoint( x/f, y/f, z/f ); }
-
- friend MercuryPoint operator * ( float f, const MercuryPoint& other ) { return other*f; }
-
- bool operator==(const MercuryPoint& p) const;
- inline bool operator!=(const MercuryPoint& p) const { return !(*this == p); }
-
- bool operator==(const float f) const;
- inline bool operator!=(const float f) const { return !(*this == f); }
-
- ///Obtain the cross product (*this) x p
- MercuryPoint CrossProduct(const MercuryPoint& p) const;
-
- float x;
- float y;
- float z;
-};
-
-#endif
-
-/***************************************************************************
- * Copyright (C) 2008 by Joshua Allen, Charles Lohr *
- * *
- * *
- * All rights reserved. *
- * *
- * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: *
- * * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. *
- * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. *
- * * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. *
- * *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT *
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR *
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR *
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, *
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, *
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR *
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF *
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING *
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS *
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
- ***************************************************************************/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wil...@us...> - 2009-07-15 05:56:26
|
Revision: 427
http://hgengine.svn.sourceforge.net/hgengine/?rev=427&view=rev
Author: willmurnane
Date: 2009-07-15 05:56:24 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
Update keyboard layout stuff to include all the keys, document what's what, etc
Modified Paths:
--------------
Mercury2/src/X11Window.cpp
Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp 2009-07-15 04:23:32 UTC (rev 426)
+++ Mercury2/src/X11Window.cpp 2009-07-15 05:56:24 UTC (rev 427)
@@ -22,18 +22,19 @@
{
switch( scanin )
{
- case 9: return 27; //esc
+ case 9: return 27; //esc
case 19: return '0';
- case 49: return 97; //`
+ case 49: return 97; //`
case 22: return 8; //backspace
case 95: return 292; //F11
case 96: return 293; //F12
- case 20: return 45; //-
- case 21: return 61; //=
- case 51: return 92; //backslash
- case 23: return 9; //tab
- case 50: return 160; //[lshift]
- case 62: return 161; //[rshift]
+ case 20: return 45; //-
+ case 21: return 61; //=
+ case 51: return 92; //backslash
+ case 23: return 9; //tab
+ case 66: return 15; //Caps lock
+ case 50: return 160; //[lshift]
+ case 62: return 161; //[rshift]
case 38: return 'a';
case 56: return 'b';
@@ -62,34 +63,61 @@
case 29: return 'y';
case 52: return 'z';
- case 34: return 91; //misc keys inbetween letters and enter
- case 35: return 93;
- case 47: return 59;
- case 48: return 39;
- case 59: return 44;
- case 60: return 46;
- case 61: return 47;
+ case 47: return 59; //;
+ case 48: return 39; //'
+ case 59: return 44; //,
+ case 60: return 46; //.
+ case 61: return 47; // /
- case 111: return 273; //arrow keys
- case 113: return 276;
- case 114: return 275;
- case 116: return 274;
+ case 111: return 273; //arrow keys: up
+ case 113: return 276; //arrow keys: left
+ case 114: return 275; //arrow keys: right
+ case 116: return 274; //arrow keys: down
- case 37: return 162; //ctrl, win, alt
- case 133: return 91;
- case 64: return 164;
+ case 37: return 162; //left ctrl
+ case 133: return 91; //left super (aka win)
+ case 64: return 164; //left alt
+ case 65: return 32; //space bar
+ case 108: return 165; //right alt
+ case 134: return 91; //right super (aka win)
+ case 135: return 93; //menu
+ case 105: return 268; //right control
- case 108: return 165; //RIGHT buttons like ctrl, sel, alt
- case 135: return 93;
- case 105: return 263;
-
- case 36: return 13;
- case 66: return 15;
-
+ case 107: return 316; //Print Screen
+ //case 78: scroll lock
+ case 127: return 19; //Pause
+ case 118: return 277; //Insert
+ case 110: return 278; //Home
+ case 112: return 280; //Page Up
+ case 119: return 127; //Delete
+ case 115: return 279; //End
+ case 117: return 181; //Page Down
+
+ //case 77: Num Lock (not mapped)
+ case 106: return 267; //Keypad /
+ case 63: return 268; //Keypad *
+ case 82: return 269; //Keypad -
+ case 79: return 263; //Keypad 7
+ case 80: return 264; //Keypad 8
+ case 81: return 265; //Keypad 9
+ case 86: return 270; //Keypad +
+ case 83: return 260; //Keypad 4
+ case 84: return 261; //Keypad 5
+ case 85: return 262; //Keypad 6
+ case 87: return 257; //Keypad 1
+ case 88: return 258; //Keypad 2
+ case 89: return 259; //Keypad 3
+ case 36: //Enter
+ case 104: return 13; //Keypad enter
+ case 90: return 260; //Keypad 0
+ case 91: return 266; //Keypad .
+
default:
+ // numbers
if( scanin >= 10 && scanin <= 18 )
return scanin + ( (short)'1' - 10 );
- if( scanin >= 67 && scanin <= 76 ) //f1-f10
+ // f1 -- f10
+ if( scanin >= 67 && scanin <= 76 )
return scanin + ( 282 - 67 );
return scanin;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-07-15 04:23:35
|
Revision: 426
http://hgengine.svn.sourceforge.net/hgengine/?rev=426&view=rev
Author: cnlohr
Date: 2009-07-15 04:23:32 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
Make the VBO able to dirty Vertices so that they can be updated on the
fly.
Modified Paths:
--------------
Mercury2/src/MercuryVBO.cpp
Mercury2/src/MercuryVBO.h
Modified: Mercury2/src/MercuryVBO.cpp
===================================================================
--- Mercury2/src/MercuryVBO.cpp 2009-07-15 04:23:04 UTC (rev 425)
+++ Mercury2/src/MercuryVBO.cpp 2009-07-15 04:23:32 UTC (rev 426)
@@ -14,6 +14,7 @@
:MercuryAsset(), m_initiated(false)
{
m_bufferIDs[0] = m_bufferIDs[1] = 0;
+ m_bDirtyIndices = m_bDirtyVertices = 0;
}
MercuryVBO::~MercuryVBO()
@@ -27,11 +28,18 @@
uint8_t numTextures = Texture::NumberActiveTextures();
uint16_t stride = sizeof(float)*8;
- if ( !m_initiated ) InitVBO();
-
+ if ( !m_initiated )
+ InitVBO();
+
if ( this != m_lastVBOrendered )
- {
+ {
m_lastVBOrendered = this;
+
+ if ( m_bDirtyVertices )
+ UpdateVertices();
+ if( m_bDirtyIndices )
+ UpdateIndices();
+
glBindBufferARB(GL_ARRAY_BUFFER_ARB, m_bufferIDs[0]);
glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, m_bufferIDs[1]);
glVertexPointer(3, GL_FLOAT, stride, BUFFER_OFFSET(sizeof(float)*5));
@@ -58,21 +66,32 @@
void MercuryVBO::InitVBO()
{
- glGenBuffersARB(2, m_bufferIDs);
-
- //vertex VBO
- glBindBufferARB(GL_ARRAY_BUFFER_ARB, m_bufferIDs[0]);
- glBufferDataARB(GL_ARRAY_BUFFER_ARB, m_vertexData.LengthInBytes(), m_vertexData.Buffer(), GL_STATIC_DRAW_ARB);
+ if (!m_bufferIDs[0])
+ {
+ glGenBuffersARB(2, m_bufferIDs);
+ }
- //indices VBO
- glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, m_bufferIDs[1]);
- glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, m_indexData.LengthInBytes(), m_indexData.Buffer(), GL_STATIC_DRAW_ARB);
-
+ UpdateIndices();
+ UpdateVertices();
glEnableClientState(GL_VERTEX_ARRAY);
m_initiated = true;
}
+void MercuryVBO::UpdateIndices()
+{
+ glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, m_bufferIDs[1]);
+ glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, m_indexData.LengthInBytes(), m_indexData.Buffer(), GL_STATIC_DRAW_ARB);
+ m_bDirtyIndices = 0;
+}
+
+void MercuryVBO::UpdateVertices()
+{
+ glBindBufferARB(GL_ARRAY_BUFFER_ARB, m_bufferIDs[0]);
+ glBufferDataARB(GL_ARRAY_BUFFER_ARB, m_vertexData.LengthInBytes(), m_vertexData.Buffer(), GL_STATIC_DRAW_ARB);
+ m_bDirtyVertices = 0;
+}
+
void MercuryVBO::AllocateVertexSpace(unsigned int count)
{
m_vertexData.Allocate(count*8);
Modified: Mercury2/src/MercuryVBO.h
===================================================================
--- Mercury2/src/MercuryVBO.h 2009-07-15 04:23:04 UTC (rev 425)
+++ Mercury2/src/MercuryVBO.h 2009-07-15 04:23:32 UTC (rev 426)
@@ -26,13 +26,20 @@
short unsigned int * GetIndexHandle() { return &m_indexData[0]; }
static void* m_lastVBOrendered;
-
+
+ void DirtyVertices() { m_bDirtyVertices = 1; }
+ void DirtyIndices() { m_bDirtyIndices = 1; }
private:
virtual void InitVBO();
unsigned int m_bufferIDs[2];
- bool m_initiated;
+ bool m_initiated;
+
+ bool m_bDirtyIndices;
+ bool m_bDirtyVertices;
+ void UpdateVertices();
+ void UpdateIndices();
protected:
AlignedBuffer<float> m_vertexData;
AlignedBuffer<uint16_t> m_indexData;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wil...@us...> - 2009-07-15 04:23:25
|
Revision: 425
http://hgengine.svn.sourceforge.net/hgengine/?rev=425&view=rev
Author: willmurnane
Date: 2009-07-15 04:23:04 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
Improved (?) X11 mouse handling: scroll wheel, buttons-by-name, stuff
Modified Paths:
--------------
Mercury2/src/MercuryInput.cpp
Mercury2/src/MercuryInput.h
Mercury2/src/X11Window.cpp
Modified: Mercury2/src/MercuryInput.cpp
===================================================================
--- Mercury2/src/MercuryInput.cpp 2009-07-15 02:37:35 UTC (rev 424)
+++ Mercury2/src/MercuryInput.cpp 2009-07-15 04:23:04 UTC (rev 425)
@@ -2,24 +2,25 @@
#include <MercuryMessageManager.h>
MouseInput::MouseInput()
- :MessageData(), dx(0), dy(0), buttonMasks(0)
+ :MessageData(), dx(0), dy(0)
{
+ buttons.data = 0;
}
-void MouseInput::ProcessMouseInput(int dx, int dy, bool leftButton, bool rightButton, bool centerButton)
+void MouseInput::ProcessMouseInput(int dx, int dy, bool leftButton, bool rightButton, bool centerButton, bool scrollUpButton, bool scrollDownButton)
{
MouseInput* mi = new MouseInput();
mi->dx = dx;
mi->dy = dy;
+ buttonMask buttons = {0};
+ buttons.left = leftButton;
+ buttons.right = rightButton;
+ buttons.center = centerButton;
+ buttons.scrollup = scrollUpButton;
+ buttons.scrolldown = scrollDownButton;
+ mi->buttons = buttons;
+ currentButtonMasks = buttons;
- uint8_t buttonMasks = 0;
- buttonMasks |= (leftButton << MOUSE_LEFT); //enable if true
- buttonMasks |= (rightButton << MOUSE_RIGHT); //enable if true
- buttonMasks |= (centerButton << MOUSE_CENTER); //enable if true
- mi->buttonMasks = buttonMasks;
-
- currentButtonMasks = buttonMasks;
-
POST_MESSAGE( INPUTEVENT_MOUSE, mi, 0 );
}
@@ -65,7 +66,7 @@
uint8_t KeyboardInput::m_keyStates[512];
-uint8_t MouseInput::currentButtonMasks;
+MouseInput::buttonMask MouseInput::currentButtonMasks;
/****************************************************************************
Modified: Mercury2/src/MercuryInput.h
===================================================================
--- Mercury2/src/MercuryInput.h 2009-07-15 02:37:35 UTC (rev 424)
+++ Mercury2/src/MercuryInput.h 2009-07-15 04:23:04 UTC (rev 425)
@@ -10,22 +10,25 @@
class MouseInput : public MessageData
{
public:
- static void ProcessMouseInput(int dx, int dy, bool leftButton, bool rightButton, bool centerButton);
+ typedef union
+ {
+ uint8_t data;
+ struct {
+ unsigned int left: 1;
+ unsigned int right: 1;
+ unsigned int center: 1;
+ unsigned int scrollup: 1;
+ unsigned int scrolldown: 1;
+ };
+ } buttonMask;
+ static void ProcessMouseInput(int dx, int dy, bool leftButton, bool rightButton, bool centerButton, bool scrollUpButton, bool scrollDownButton);
MouseInput();
int32_t dx, dy;
- uint8_t buttonMasks;
+ buttonMask buttons;
- enum MouseButton
- {
- MOUSE_NONE = 0,
- MOUSE_LEFT = 1,
- MOUSE_RIGHT = 2,
- MOUSE_CENTER = 3
- };
-
private:
- static uint8_t currentButtonMasks;
+ static buttonMask currentButtonMasks;
};
class KeyboardInput : public MessageData
Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp 2009-07-15 02:37:35 UTC (rev 424)
+++ Mercury2/src/X11Window.cpp 2009-07-15 04:23:04 UTC (rev 425)
@@ -3,6 +3,18 @@
#include <MercuryInput.h>
#include <MercuryPrefs.h>
+#define MOUSE_BTN_LEFT 1
+#define MOUSE_BTN_RIGHT 3
+#define MOUSE_BTN_CENTER 2
+#define MOUSE_BTN_SCROLL_UP 4
+#define MOUSE_BTN_SCROLL_DOWN 5
+
+// Use X11_MASK(MOUSE_BTN_SCROLL_UP) to generate the token Button4Mask
+#define X11_MASK(x) _X11_MASK(x)
+// Sigh... second #define needed, because otherwise x doesn't get evaluated.
+// That is, instead of giving you Button4Mask this would give ButtonMOUSE_BTN_SCROLL_UPMask
+#define _X11_MASK(x) Button##x##Mask
+
Callback0R< MercuryWindow* > MercuryWindow::genWindowClbk(X11Window::GenX11Window); //Register window generation callback
//XXX: THIS SECTION IS INCOMPLETE! IT NEEDS The right half of the keyboard (Bar arrow keys) + it needs the windows keys/sel keys mapped
@@ -236,7 +248,19 @@
case ButtonRelease:
{
XButtonEvent* e = (XButtonEvent*)&event;
- MouseInput::ProcessMouseInput(0, 0, e->button & Button1, e->button & Button3, e->button & Button2);
+ uint8_t left, right, center, su, sd;
+ left = (e->state & X11_MASK(MOUSE_BTN_LEFT)) ^ (e->button == MOUSE_BTN_LEFT);
+ right = (e->state & X11_MASK(MOUSE_BTN_RIGHT)) ^ (e->button == MOUSE_BTN_RIGHT);
+ center = (e->state & X11_MASK(MOUSE_BTN_CENTER)) ^ (e->button == MOUSE_BTN_CENTER);
+ su = (e->state & X11_MASK(MOUSE_BTN_SCROLL_UP)) ^ (e->button == MOUSE_BTN_SCROLL_UP);
+ sd = (e->state & X11_MASK(MOUSE_BTN_SCROLL_DOWN)) ^ (e->button == MOUSE_BTN_SCROLL_DOWN);
+
+ MouseInput::ProcessMouseInput(0, 0,
+ e->state & X11_MASK(MOUSE_BTN_LEFT),
+ e->state & X11_MASK(MOUSE_BTN_RIGHT),
+ e->state & X11_MASK(MOUSE_BTN_CENTER),
+ e->state & X11_MASK(MOUSE_BTN_SCROLL_UP),
+ e->state & X11_MASK(MOUSE_BTN_SCROLL_DOWN));
break;
}
case KeyPress:
@@ -257,25 +281,28 @@
}
case MotionNotify:
{
+
XMotionEvent* e = (XMotionEvent*)&event;
int x, y;
- bool left, right, center;
- left = e->state & Button1Mask;
- right = e->state & Button3Mask;
- center = e->state & Button2Mask;
+ bool left, right, center, su, sd;
+ left = e->state & X11_MASK(MOUSE_BTN_LEFT);
+ right = e->state & X11_MASK(MOUSE_BTN_RIGHT);
+ center = e->state & X11_MASK(MOUSE_BTN_CENTER);
+ su = e->state & X11_MASK(MOUSE_BTN_SCROLL_UP);
+ sd = e->state & X11_MASK(MOUSE_BTN_SCROLL_DOWN);
if( m_bGrabbed )
{
x = m_width/2 - e->x;
y = m_height/2 - e->y;
if (x!=0 || y!=0) //prevent recursive XWarp
{
- MouseInput::ProcessMouseInput(x, y, left, right, center);
+ MouseInput::ProcessMouseInput(x, y, left, right, center, su, sd);
XWarpPointer(m_display, None, m_window, 0,0,0,0,m_width/2,m_height/2);
}
}
else
{
- MouseInput::ProcessMouseInput(e->x, e->y, left, right, center);
+ MouseInput::ProcessMouseInput(e->x, e->y, left, right, center, su, sd);
}
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wil...@us...> - 2009-07-15 02:37:40
|
Revision: 424
http://hgengine.svn.sourceforge.net/hgengine/?rev=424&view=rev
Author: willmurnane
Date: 2009-07-15 02:37:35 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
Mouse-tracking code (mostly last revision, my bad)
Modified Paths:
--------------
Mercury2/src/GLHelpers.h
Modified: Mercury2/src/GLHelpers.h
===================================================================
--- Mercury2/src/GLHelpers.h 2009-07-15 02:36:45 UTC (rev 423)
+++ Mercury2/src/GLHelpers.h 2009-07-15 02:37:35 UTC (rev 424)
@@ -1,10 +1,12 @@
#include <global.h>
#include <MercuryUtil.h>
#include <MercuryMatrix.h>
+#include <MercuryVertex.h>
MString GlError2String(uint32_t e);
void glLoadMatrix(const MercuryMatrix& m);
MercuryMatrix glGetMatrix(int m);
+MercuryVertex pointFromScreenLoc(int screen_x, int screen_y);
/****************************************************************************
* Copyright (C) 2009 by Joshua Allen *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wil...@us...> - 2009-07-15 02:36:55
|
Revision: 423
http://hgengine.svn.sourceforge.net/hgengine/?rev=423&view=rev
Author: willmurnane
Date: 2009-07-15 02:36:45 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
Use int instead of GLenum to avoid needing gl.h et al #included
Modified Paths:
--------------
Mercury2/src/GLHelpers.cpp
Mercury2/src/GLHelpers.h
Modified: Mercury2/src/GLHelpers.cpp
===================================================================
--- Mercury2/src/GLHelpers.cpp 2009-07-15 01:59:15 UTC (rev 422)
+++ Mercury2/src/GLHelpers.cpp 2009-07-15 02:36:45 UTC (rev 423)
@@ -55,6 +55,29 @@
return mm;
}
+MercuryVertex pointFromScreenLoc(int screen_x, int screen_y)
+{
+ GLfloat winX, winY, winZ;
+ GLdouble mouseX = 0, mouseY = 0, mouseZ = 0;
+ GLint viewport[4];
+ GLdouble modelview[16];
+ GLdouble projection[16];
+
+ glGetIntegerv(GL_VIEWPORT, viewport);
+ glGetDoublev(GL_MODELVIEW_MATRIX, modelview);
+ glGetDoublev(GL_PROJECTION_MATRIX, projection);
+
+ winX = (float)screen_x;
+ winY = (float)viewport[3] - (float)screen_y;
+ glReadPixels( screen_x, (int)winY, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &winZ );
+
+ gluUnProject(
+ winX, winY, winZ,
+ modelview, projection, viewport,
+ &mouseX, &mouseY, &mouseZ);
+ return MercuryVertex( mouseX, mouseY, mouseZ );
+}
+
/****************************************************************************
* Copyright (C) 2009 by Joshua Allen *
* *
Modified: Mercury2/src/GLHelpers.h
===================================================================
--- Mercury2/src/GLHelpers.h 2009-07-15 01:59:15 UTC (rev 422)
+++ Mercury2/src/GLHelpers.h 2009-07-15 02:36:45 UTC (rev 423)
@@ -4,7 +4,7 @@
MString GlError2String(uint32_t e);
void glLoadMatrix(const MercuryMatrix& m);
-MercuryMatrix glGetMatrix(GLenum m);
+MercuryMatrix glGetMatrix(int m);
/****************************************************************************
* Copyright (C) 2009 by Joshua Allen *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wil...@us...> - 2009-07-15 01:59:18
|
Revision: 422
http://hgengine.svn.sourceforge.net/hgengine/?rev=422&view=rev
Author: willmurnane
Date: 2009-07-15 01:59:15 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
Translate repeated keys, too!
Modified Paths:
--------------
Mercury2/src/X11Window.cpp
Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp 2009-07-13 05:33:28 UTC (rev 421)
+++ Mercury2/src/X11Window.cpp 2009-07-15 01:59:15 UTC (rev 422)
@@ -243,7 +243,7 @@
{
//ignore autorepeat
if ( IsKeyRepeat(&event.xkey) ) break;
-
+
KeyboardInput::ProcessKeyInput( ConvertScancode( event.xkey.keycode ), true, false);
break;
}
@@ -298,7 +298,7 @@
nEvent.xkey.time == e->time)
{
XNextEvent(m_display, &nEvent); //forget next event
- KeyboardInput::ProcessKeyInput(e->keycode, true, true); //set repeat flag
+ KeyboardInput::ProcessKeyInput( ConvertScancode( e->keycode ), true, true ); //set repeat flag
return true;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-07-13 05:33:33
|
Revision: 421
http://hgengine.svn.sourceforge.net/hgengine/?rev=421&view=rev
Author: cnlohr
Date: 2009-07-13 05:33:28 +0000 (Mon, 13 Jul 2009)
Log Message:
-----------
enable/disable mouse grabbing. This is nonintuitive at first, as HG1
only enabled grabbed input, however many non-FPS games (Even some 3rd
person games) do not grab the mouse. This enables users to intuitively
use their mouse at their own will for these games.
Modified Paths:
--------------
Mercury2/src/MercuryWindow.cpp
Mercury2/src/MercuryWindow.h
Mercury2/src/X11Window.cpp
Modified: Mercury2/src/MercuryWindow.cpp
===================================================================
--- Mercury2/src/MercuryWindow.cpp 2009-07-10 03:36:11 UTC (rev 420)
+++ Mercury2/src/MercuryWindow.cpp 2009-07-13 05:33:28 UTC (rev 421)
@@ -1,7 +1,8 @@
#include "MercuryWindow.h"
MercuryWindow::MercuryWindow(const MString& title, int width, int height, int bits, int depthBits, bool fullscreen)
- :m_title(title), m_width(width), m_height(height), m_bits(bits), m_depthBits(depthBits), m_fullscreen(fullscreen)
+ :m_title(title), m_width(width), m_height(height), m_bits(bits), m_depthBits(depthBits), m_fullscreen(fullscreen),
+ m_bGrabbed(true)
{
}
Modified: Mercury2/src/MercuryWindow.h
===================================================================
--- Mercury2/src/MercuryWindow.h 2009-07-10 03:36:11 UTC (rev 420)
+++ Mercury2/src/MercuryWindow.h 2009-07-13 05:33:28 UTC (rev 421)
@@ -32,10 +32,13 @@
inline int Width() const { return m_width; }
inline int Height() const { return m_height; }
+ void SetGrabbedMouseMode( bool bGrabbed ) { m_bGrabbed = bGrabbed; }
+ bool GetGrabbedMouseMode( ) { return m_bGrabbed; }
protected:
static Callback0R< MercuryWindow* > genWindowClbk;
static MercuryWindow* m_windowInstance;
+ bool m_bGrabbed;
MString m_title;
int m_width, m_height;
uint8_t m_bits, m_depthBits;
Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp 2009-07-10 03:36:11 UTC (rev 420)
+++ Mercury2/src/X11Window.cpp 2009-07-13 05:33:28 UTC (rev 421)
@@ -223,7 +223,7 @@
{
XFocusChangeEvent*e = (XFocusChangeEvent*)&event;
inFocus = (event.type == FocusIn);
- if (inFocus) XWarpPointer(m_display, None, m_window, 0,0,0,0,m_width/2,m_height/2);
+ if (inFocus && m_bGrabbed ) XWarpPointer(m_display, None, m_window, 0,0,0,0,m_width/2,m_height/2);
break;
}
}
@@ -263,14 +263,20 @@
left = e->state & Button1Mask;
right = e->state & Button3Mask;
center = e->state & Button2Mask;
- x = m_width/2 - e->x;
- y = m_height/2 - e->y;
- if (x!=0 || y!=0) //prevent recursive XWarp
+ if( m_bGrabbed )
{
- MouseInput::ProcessMouseInput(x, y,
- left, right, center);
- XWarpPointer(m_display, None, m_window, 0,0,0,0,m_width/2,m_height/2);
+ x = m_width/2 - e->x;
+ y = m_height/2 - e->y;
+ if (x!=0 || y!=0) //prevent recursive XWarp
+ {
+ MouseInput::ProcessMouseInput(x, y, left, right, center);
+ XWarpPointer(m_display, None, m_window, 0,0,0,0,m_width/2,m_height/2);
+ }
}
+ else
+ {
+ MouseInput::ProcessMouseInput(e->x, e->y, left, right, center);
+ }
break;
}
default:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-07-10 03:36:15
|
Revision: 420
http://hgengine.svn.sourceforge.net/hgengine/?rev=420&view=rev
Author: cnlohr
Date: 2009-07-10 03:36:11 +0000 (Fri, 10 Jul 2009)
Log Message:
-----------
add doxy file
Added Paths:
-----------
Mercury2/docs/Doxyfile
Added: Mercury2/docs/Doxyfile
===================================================================
--- Mercury2/docs/Doxyfile (rev 0)
+++ Mercury2/docs/Doxyfile 2009-07-10 03:36:11 UTC (rev 420)
@@ -0,0 +1,1510 @@
+# Doxyfile 1.5.8
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+# TAG = value [value, ...]
+# For lists items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME = Mercury Game Engine
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER = 2.0
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = output
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
+# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene,
+# Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses.
+# With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this tag.
+# The format is ext=language, where ext is a file extension, and language is one of
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C
+
+EXTENSION_MAPPING =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will rougly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
+# doxygen. The layout file controls the global structure of the generated output files
+# in an output format independent way. The create the layout file that represents
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name
+# of the layout file.
+
+LAYOUT_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT = ../src
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = YES
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET =
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
+# are set, an additional index file will be generated that can be used as input for
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
+# HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE =
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
+# For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION =
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to FRAME, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# probably better off using the HTML help feature. Other possible values
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list;
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
+# disables this behavior completely. For backwards compatibility with previous
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
+# respectively.
+
+GENERATE_TREEVIEW = NONE
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH = 250
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE = 10
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED = HGENGINE HAVE_CONFIG
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
+# powerful graphs.
+
+CLASS_DIAGRAMS = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT = YES
+
+# By default doxygen will write a font called FreeSans.ttf to the output
+# directory and reference it in all dot files that doxygen generates. This
+# font does not include all possible unicode characters however, so when you need
+# these (or just want a differently looking font) you can specify the font name
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
+# which can be done by putting it in a standard location or by setting the
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
+# containing the font.
+
+DOT_FONTNAME = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the output directory to look for the
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
+# different font using DOT_FONTNAME you can set the path where dot
+# can find it using this tag.
+
+DOT_FONTPATH =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT t...
[truncated message content] |
