Menu
▾
▴
[Hgengine-cvs] SF.net SVN: hgengine:[95] Mercury2/src
|
From: <axl...@us...> - 2008-12-30 15:09:03
|
Revision: 95
http://hgengine.svn.sourceforge.net/hgengine/?rev=95&view=rev
Author: axlecrusher
Date: 2008-12-30 15:08:53 +0000 (Tue, 30 Dec 2008)
Log Message:
-----------
fix header defines
Modified Paths:
--------------
Mercury2/src/AlignedBuffer.h
Mercury2/src/HGMDLMesh.h
Mercury2/src/HGMDLModel.h
Mercury2/src/MercuryPoint.h
Mercury2/src/MercuryVBO.cpp
Mercury2/src/MercuryVBO.h
Mercury2/src/Quad.h
Mercury2/src/Texture.h
Mercury2/src/TransformNode.h
Mercury2/src/Viewport.h
Mercury2/src/X11Window.h
Modified: Mercury2/src/AlignedBuffer.h
===================================================================
--- Mercury2/src/AlignedBuffer.h 2008-12-30 14:53:52 UTC (rev 94)
+++ Mercury2/src/AlignedBuffer.h 2008-12-30 15:08:53 UTC (rev 95)
@@ -1,3 +1,5 @@
+#ifndef ALIGNEDBUFFER_H
+#define ALIGNEDBUFFER_H
template <typename T>
class AlignedBuffer
@@ -38,6 +40,8 @@
T* m_data, *m_mem;
};
+#endif
+
/****************************************************************************
* Copyright (C) 2008 by Joshua Allen *
* *
Modified: Mercury2/src/HGMDLMesh.h
===================================================================
--- Mercury2/src/HGMDLMesh.h 2008-12-30 14:53:52 UTC (rev 94)
+++ Mercury2/src/HGMDLMesh.h 2008-12-30 15:08:53 UTC (rev 95)
@@ -1,3 +1,6 @@
+#ifndef HGMDLMESH_H
+#define HGMDLMESH_H
+
#include <MercuryVBO.h>
class HGMDLMesh : public MercuryVBO
@@ -9,6 +12,8 @@
bool m_cachable;
};
+#endif
+
/****************************************************************************
* Copyright (C) 2008 by Joshua Allen *
* *
Modified: Mercury2/src/HGMDLModel.h
===================================================================
--- Mercury2/src/HGMDLModel.h 2008-12-30 14:53:52 UTC (rev 94)
+++ Mercury2/src/HGMDLModel.h 2008-12-30 15:08:53 UTC (rev 95)
@@ -1,3 +1,6 @@
+#ifndef HGMDLMODEL_H
+#define HGMDLMODEL_H
+
#include <MercuryAsset.h>
#include <HGMDLMesh.h>
@@ -16,6 +19,8 @@
std::list< HGMDLMesh* > m_meshes;
};
+#endif
+
/****************************************************************************
* Copyright (C) 2008 by Joshua Allen *
* *
Modified: Mercury2/src/MercuryPoint.h
===================================================================
--- Mercury2/src/MercuryPoint.h 2008-12-30 14:53:52 UTC (rev 94)
+++ Mercury2/src/MercuryPoint.h 2008-12-30 15:08:53 UTC (rev 95)
@@ -1,3 +1,6 @@
+#ifndef MERCURYPOINT_H
+#define MERCURYPOINT_H
+
///A point in space/vector
class MercuryPoint
{
@@ -77,6 +80,8 @@
float z;
};
+#endif
+
/***************************************************************************
* Copyright (C) 2008 by Joshua Allen, Charles Lohr *
* *
Modified: Mercury2/src/MercuryVBO.cpp
===================================================================
--- Mercury2/src/MercuryVBO.cpp 2008-12-30 14:53:52 UTC (rev 94)
+++ Mercury2/src/MercuryVBO.cpp 2008-12-30 15:08:53 UTC (rev 95)
@@ -23,8 +23,8 @@
void MercuryVBO::Render(MercuryNode* node)
{
- unsigned short numTextures = Texture::NumberActiveTextures();
- unsigned short stride = sizeof(float)*8;
+ uint8_t numTextures = Texture::NumberActiveTextures();
+ uint16_t stride = sizeof(float)*8;
if ( m_initiated )
{
Modified: Mercury2/src/MercuryVBO.h
===================================================================
--- Mercury2/src/MercuryVBO.h 2008-12-30 14:53:52 UTC (rev 94)
+++ Mercury2/src/MercuryVBO.h 2008-12-30 15:08:53 UTC (rev 95)
@@ -1,3 +1,6 @@
+#ifndef MERCURYVBO_H
+#define MERCURYVBO_H
+
#include <MercuryAsset.h>
#include <AlignedBuffer.h>
@@ -24,6 +27,8 @@
AlignedBuffer<uint16_t> m_indexData;
};
+#endif
+
/****************************************************************************
* Copyright (C) 2008 by Joshua Allen *
* *
Modified: Mercury2/src/Quad.h
===================================================================
--- Mercury2/src/Quad.h 2008-12-30 14:53:52 UTC (rev 94)
+++ Mercury2/src/Quad.h 2008-12-30 15:08:53 UTC (rev 95)
@@ -1,5 +1,7 @@
+#ifndef MERCURYQUAD_H
+#define MERCURYQUAD_H
+
#include <MercuryAsset.h>
-
#include <MercuryVBO.h>
class Quad : public MercuryVBO
@@ -14,6 +16,8 @@
static Quad* m_myInstance;
};
+#endif
+
/***************************************************************************
* Copyright (C) 2008 by Joshua Allen *
* *
Modified: Mercury2/src/Texture.h
===================================================================
--- Mercury2/src/Texture.h 2008-12-30 14:53:52 UTC (rev 94)
+++ Mercury2/src/Texture.h 2008-12-30 15:08:53 UTC (rev 95)
@@ -1,3 +1,6 @@
+#ifndef TEXTURE_H
+#define TEXTURE_H
+
#include <MercuryAsset.h>
#include <RawImageData.h>
@@ -31,6 +34,8 @@
static unsigned short m_activeTextures;
};
+#endif
+
/***************************************************************************
* Copyright (C) 2008 by Joshua Allen *
* *
Modified: Mercury2/src/TransformNode.h
===================================================================
--- Mercury2/src/TransformNode.h 2008-12-30 14:53:52 UTC (rev 94)
+++ Mercury2/src/TransformNode.h 2008-12-30 15:08:53 UTC (rev 95)
@@ -1,3 +1,6 @@
+#ifndef TRANSFORMNODE_H
+#define TRANSFORMNODE_H
+
#include <MercuryNode.h>
#include <MercuryPoint.h>
#include <MercuryMatrix.h>
@@ -45,6 +48,8 @@
bool m_tainted;
};
+#endif
+
/****************************************************************************
* Copyright (C) 2008 by Joshua Allen *
* *
Modified: Mercury2/src/Viewport.h
===================================================================
--- Mercury2/src/Viewport.h 2008-12-30 14:53:52 UTC (rev 94)
+++ Mercury2/src/Viewport.h 2008-12-30 15:08:53 UTC (rev 95)
@@ -1,3 +1,6 @@
+#ifndef VIEWPORT_H
+#define VIEWPORT_H
+
#include <RenderableNode.h>
#include <MercuryMatrix.h>
class Viewport : public RenderableNode
@@ -14,6 +17,8 @@
MercuryMatrix m_frustum;
};
+#endif
+
/***************************************************************************
* Copyright (C) 2008 by Joshua Allen *
* *
Modified: Mercury2/src/X11Window.h
===================================================================
--- Mercury2/src/X11Window.h 2008-12-30 14:53:52 UTC (rev 94)
+++ Mercury2/src/X11Window.h 2008-12-30 15:08:53 UTC (rev 95)
@@ -1,3 +1,6 @@
+#ifndef X11WINDOW_H
+#define X11WINDOW_H
+
#include <MercuryWindow.h>
#include <X11/Xlib.h>
#include <GL/glx.h>
@@ -23,6 +26,8 @@
Atom m_wmDeleteMessage;
};
+#endif
+
/***************************************************************************
* Copyright (C) 2008 by Joshua Allen *
* *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
