Menu
▾
▴
[Sirrf-svn-update] SF.net SVN: sirrf:[22] trunk/src
|
From: <zcc...@us...> - 2009-05-09 14:22:04
|
Revision: 22
http://sirrf.svn.sourceforge.net/sirrf/?rev=22&view=rev
Author: zccdark203
Date: 2009-05-09 14:21:58 +0000 (Sat, 09 May 2009)
Log Message:
-----------
Added TerrainComponent and reviewed previously commited components.
Modified Paths:
--------------
trunk/src/components/scene/AnimatedMeshComponent.cpp
trunk/src/components/scene/AnimatedMeshComponent.h
trunk/src/components/scene/BillboardComponent.cpp
trunk/src/components/scene/BillboardComponent.h
trunk/src/components/scene/CameraComponent.cpp
trunk/src/components/scene/CameraComponent.h
trunk/src/components/scene/LightComponent.cpp
trunk/src/components/scene/LightComponent.h
trunk/src/components/scene/TextBillboardComponent.cpp
trunk/src/components/scene/TextBillboardComponent.h
trunk/src/components/scene/TextComponent.cpp
trunk/src/components/scene/TextComponent.h
trunk/src/sirrf.cbp
trunk/src/sirrf.depend
trunk/src/sirrf.layout
Added Paths:
-----------
trunk/src/components/scene/TerrainComponent.cpp
trunk/src/components/scene/TerrainComponent.h
Modified: trunk/src/components/scene/AnimatedMeshComponent.cpp
===================================================================
--- trunk/src/components/scene/AnimatedMeshComponent.cpp 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/components/scene/AnimatedMeshComponent.cpp 2009-05-09 14:21:58 UTC (rev 22)
@@ -73,7 +73,7 @@
}
// Returns the current end frame number.
-int AnimatedMeshComponent::getEndFrame()
+int AnimatedMeshComponent::getEndFrame() const
{
return mAnimatedMeshSN->getEndFrame();
}
@@ -85,7 +85,7 @@
}
// Returns the current displayed frame number.
-int AnimatedMeshComponent::getFrame()
+int AnimatedMeshComponent::getFrame() const
{
return mAnimatedMeshSN->getFrameNr();
}
@@ -103,7 +103,7 @@
}
// Returns the current start frame number.
-int AnimatedMeshComponent::getStartFrame()
+int AnimatedMeshComponent::getStartFrame() const
{
return mAnimatedMeshSN->getStartFrame();
}
Modified: trunk/src/components/scene/AnimatedMeshComponent.h
===================================================================
--- trunk/src/components/scene/AnimatedMeshComponent.h 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/components/scene/AnimatedMeshComponent.h 2009-05-09 14:21:58 UTC (rev 22)
@@ -41,11 +41,11 @@
void animate();
- int getEndFrame();
- int getFrame();
+ int getEndFrame() const;
+ int getFrame() const;
IMesh* getMesh();
IShadowVolumeSceneNode* getShadowVolumeSceneNode();
- int getStartFrame();
+ int getStartFrame() const;
void setAnimationSpeed(float speed);
void setCurrentFrame(int frame);
Modified: trunk/src/components/scene/BillboardComponent.cpp
===================================================================
--- trunk/src/components/scene/BillboardComponent.cpp 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/components/scene/BillboardComponent.cpp 2009-05-09 14:21:58 UTC (rev 22)
@@ -30,8 +30,8 @@
}
// BillboardComponent constructor.
-BillboardComponent::BillboardComponent(Entity *parent, const dimension2df &size, SColor colorTop,
- SColor colorBottom)
+BillboardComponent::BillboardComponent(Entity *parent, const dimension2df &size,
+ const SColor &colorTop, const SColor &colorBottom)
: SceneComponent(parent, true)
{
ISceneManager *pSceneMgr = GameManager::Instance()->getSceneManager();
@@ -63,6 +63,18 @@
return mBillboardSN;
}
+// Gets the color of the top and bottom vertices of the billboard.
+void BillboardComponent::getColor(SColor &topColor, SColor &bottomColor) const
+{
+ mBillboardSN->getColor(topColor, bottomColor);
+}
+
+// Returns the size of the billboard.
+const dimension2df& BillboardComponent::getSize() const
+{
+ return mBillboardSN->getSize();
+}
+
// Set the color of all vertices of the billboard.
void BillboardComponent::setColor(const SColor &overallColor)
{
@@ -81,16 +93,4 @@
mBillboardSN->setSize(size);
}
-// Gets the color of the top and bottom vertices of the billboard.
-void BillboardComponent::getColor(SColor &topColor, SColor &bottomColor) const
-{
- mBillboardSN->getColor(topColor, bottomColor);
-}
-
-// Returns the size of the billboard.
-const dimension2df& BillboardComponent::getSize() const
-{
- return mBillboardSN->getSize();
-}
-
// End of File
Modified: trunk/src/components/scene/BillboardComponent.h
===================================================================
--- trunk/src/components/scene/BillboardComponent.h 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/components/scene/BillboardComponent.h 2009-05-09 14:21:58 UTC (rev 22)
@@ -29,7 +29,8 @@
// Initialisation and deinitialisation
BillboardComponent(Entity *parent);
BillboardComponent(Entity *parent, const dimension2df &size = dimension2df(10.0f, 10.0f),
- SColor colorTop = 0xFFFFFFFF, SColor colorBottom = 0xFFFFFFFF);
+ const SColor &colorTop = SColor(255, 255, 255, 255),
+ const SColor &colorBottom = SColor(255, 255, 255, 255));
~BillboardComponent();
// Methods
Modified: trunk/src/components/scene/CameraComponent.cpp
===================================================================
--- trunk/src/components/scene/CameraComponent.cpp 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/components/scene/CameraComponent.cpp 2009-05-09 14:21:58 UTC (rev 22)
@@ -51,61 +51,61 @@
}
// Queries if the camera scene node's rotation and its target position are bound together.
-bool CameraComponent::getTargetAndRotationBinding()
+bool CameraComponent::getTargetAndRotationBinding() const
{
return mCameraSN->getTargetAndRotationBinding();
}
// Gets the aspect ratio of the camera.
-float CameraComponent::getAspectRatio()
+float CameraComponent::getAspectRatio() const
{
return mCameraSN->getAspectRatio();
}
// Gets the value of the far plane of the camera.
-float CameraComponent::getFarValue()
+float CameraComponent::getFarValue() const
{
return mCameraSN->getFarValue();
}
// Gets the field of view of the camera.
-float CameraComponent::getFOV()
+float CameraComponent::getFOV() const
{
return mCameraSN->getFOV();
}
// Gets the value of the near plane of the camera.
-float CameraComponent::getNearValue()
+float CameraComponent::getNearValue() const
{
return mCameraSN->getNearValue();
}
// Gets the current projection matrix of the camera.
-const matrix4& CameraComponent::getProjectionMatrix()
+const matrix4& CameraComponent::getProjectionMatrix() const
{
return mCameraSN->getProjectionMatrix();
}
// Gets the current look at target of the camera.
-const vector3df& CameraComponent::getTarget()
+const vector3df& CameraComponent::getTarget() const
{
return mCameraSN->getTarget();
}
// Gets the up vector of the camera.
-const vector3df& CameraComponent::getUpVector()
+const vector3df& CameraComponent::getUpVector() const
{
return mCameraSN->getUpVector();
}
// Gets the current view matrix of the camera.
-const matrix4& CameraComponent::getViewMatrix()
+const matrix4& CameraComponent::getViewMatrix() const
{
return mCameraSN->getViewMatrix();
}
// Checks if the camera is orthogonal.
-bool CameraComponent::getIsOrthogonal()
+bool CameraComponent::getIsOrthogonal() const
{
return mCameraSN->isOrthogonal();
}
Modified: trunk/src/components/scene/CameraComponent.h
===================================================================
--- trunk/src/components/scene/CameraComponent.h 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/components/scene/CameraComponent.h 2009-05-09 14:21:58 UTC (rev 22)
@@ -34,17 +34,17 @@
ICameraSceneNode* getCameraSceneNode();
void bindTargetAndRotation(bool bound);
- bool getTargetAndRotationBinding();
+ bool getTargetAndRotationBinding() const;
- float getAspectRatio();
- float getFarValue();
- float getFOV();
- float getNearValue();
- const matrix4& getProjectionMatrix();
- const vector3df& getTarget();
- const vector3df& getUpVector();
- const matrix4& getViewMatrix();
- bool getIsOrthogonal();
+ float getAspectRatio() const;
+ float getFarValue() const;
+ float getFOV() const;
+ float getNearValue() const;
+ const matrix4& getProjectionMatrix() const;
+ const vector3df& getTarget() const;
+ const vector3df& getUpVector() const;
+ const matrix4& getViewMatrix()const;
+ bool getIsOrthogonal()const;
void setAsMainCamera();
void setAspectRatio(float aspect);
Modified: trunk/src/components/scene/LightComponent.cpp
===================================================================
--- trunk/src/components/scene/LightComponent.cpp 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/components/scene/LightComponent.cpp 2009-05-09 14:21:58 UTC (rev 22)
@@ -30,7 +30,7 @@
}
// LightComponent constructor.
-LightComponent::LightComponent(Entity *parent, SColorf color, float radius)
+LightComponent::LightComponent(Entity *parent, const SColorf &color, float radius)
: SceneComponent(parent, true)
{
ISceneManager *pSceneMgr = GameManager::Instance()->getSceneManager();
@@ -53,19 +53,19 @@
}
// Returns whether this light casts shadows.
-bool LightComponent::getCastShadow()
+bool LightComponent::getCastShadow() const
{
return mLightSN->getCastShadow();
}
// Gets the light type.
-E_LIGHT_TYPE LightComponent::getLightType()
+E_LIGHT_TYPE LightComponent::getLightType() const
{
return mLightSN->getLightType();
}
// Gets the light's radius of influence.
-float LightComponent::getRadius()
+float LightComponent::getRadius() const
{
return mLightSN->getRadius();
}
Modified: trunk/src/components/scene/LightComponent.h
===================================================================
--- trunk/src/components/scene/LightComponent.h 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/components/scene/LightComponent.h 2009-05-09 14:21:58 UTC (rev 22)
@@ -28,16 +28,16 @@
// Initialisation and deinitialisation
LightComponent(Entity *parent);
- LightComponent(Entity *parent, SColorf color = SColorf(1.0f, 1.0f, 1.0f),
+ LightComponent(Entity *parent, const SColorf &color = SColorf(1.0f, 1.0f, 1.0f),
float radius = 100.0f);
~LightComponent();
// Methods
ILightSceneNode* getLightSceneNode();
- bool getCastShadow();
- E_LIGHT_TYPE getLightType();
- float getRadius();
+ bool getCastShadow() const;
+ E_LIGHT_TYPE getLightType() const;
+ float getRadius() const;
void setCastShadow(bool shadow = true);
void setLightType(E_LIGHT_TYPE type);
Added: trunk/src/components/scene/TerrainComponent.cpp
===================================================================
--- trunk/src/components/scene/TerrainComponent.cpp (rev 0)
+++ trunk/src/components/scene/TerrainComponent.cpp 2009-05-09 14:21:58 UTC (rev 22)
@@ -0,0 +1,111 @@
+// /////////////////////////////////////////////////////////////////////////////
+//
+// Name: TerrainComponent.cpp
+// Author: Michael Bartsch (ZCCdark203)
+//
+// Desc : Component wrapper of Irrlicht's ITerrainSceneNode.
+//
+// License: Copyright (C) 2009 Michael Bartsch
+//
+// This program is free software: you can redistribute it
+// and/or modify it under the terms of the zlib/libpng License.
+// See main.cpp for conditions of distribution and use.
+//
+// /////////////////////////////////////////////////////////////////////////////
+
+// Include files
+#include "TerrainComponent.h"
+#include "../../core/GameManager.h"
+
+
+// TerrainComponent class
+// TerrainComponent constructor (default).
+TerrainComponent::TerrainComponent(Entity *parent)
+: SceneComponent(parent, true)
+{
+ ISceneManager *pSceneMgr = GameManager::Instance()->getSceneManager();
+
+ mTerrainSN = pSceneMgr->addTerrainSceneNode("", 0, parent->getID(), vector3df(0.0f, 0.0f, 0.0f),
+ vector3df(0.0f, 0.0f, 0.0f),
+ vector3df(1.0f, 1.0f, 1.0f),
+ SColor(255, 255, 255, 255), 5, ETPS_17, 0, true);
+ mSceneNode = mTerrainSN;
+}
+
+// TerrainComponent constructor.
+TerrainComponent::TerrainComponent(Entity *parent, const std::string &fileName,
+ const vector3df &rotation, const vector3df &scale,
+ const SColor &vertexColor, int maxLOD, int smoothFactor)
+: SceneComponent(parent, true)
+{
+ ISceneManager *pSceneMgr = GameManager::Instance()->getSceneManager();
+
+ mTerrainSN = pSceneMgr->addTerrainSceneNode(fileName.c_str(), 0, parent->getID(),
+ vector3df(0.0f, 0.0f, 0.0f), rotation, scale,
+ vertexColor, maxLOD, ETPS_17, smoothFactor, true);
+ mSceneNode = mTerrainSN;
+}
+
+// TerrainComponent deconstructor.
+TerrainComponent::~TerrainComponent()
+{
+ mTerrainSN->remove();
+ mSceneNode = NULL;
+}
+
+// Gets a direct pointer to the ITerrainSceneNode.
+ITerrainSceneNode* TerrainComponent::getTerrainSceneNode()
+{
+ return mTerrainSN;
+}
+
+// Gets the bounding box of the terrain.
+const aabbox3df& TerrainComponent::getBoundingBox() const
+{
+ return mTerrainSN->getBoundingBox();
+}
+
+// Gets the bounding box of a patch.
+const aabbox3df& TerrainComponent::getBoundingBox(int patchX, int patchZ) const
+{
+ return mTerrainSN->getBoundingBox(patchX, patchZ);
+}
+
+// Gets the height of a point of the terrain.
+float TerrainComponent::getHeight(float x, float y)
+{
+ return mTerrainSN->getHeight(x, y);
+}
+
+// Gets pointer to the mesh.
+IMesh* TerrainComponent::getMesh()
+{
+ return mTerrainSN->getMesh();
+}
+
+// Gets center of terrain.
+const vector3df& TerrainComponent::getTerrainCenter() const
+{
+ return mTerrainSN->getTerrainCenter();
+}
+
+// Loads the data from a heightMapFile.
+bool TerrainComponent::loadHeightMap(const std::string &fileName, const SColor &vertexColor,
+ int smoothFactor)
+{
+ IReadFile *file = GameManager::Instance()->getDevice()->getFileSystem()->
+ createAndOpenFile(fileName.c_str());
+
+ bool result = mTerrainSN->loadHeightMap(file, vertexColor, smoothFactor);
+ file->drop();
+
+ return result;
+}
+
+// Scales the base texture.
+void TerrainComponent::scaleTexture(float scale, float scale2)
+{
+ mTerrainSN->scaleTexture(scale, scale2);
+}
+
+// End of File
Added: trunk/src/components/scene/TerrainComponent.h
===================================================================
--- trunk/src/components/scene/TerrainComponent.h (rev 0)
+++ trunk/src/components/scene/TerrainComponent.h 2009-05-09 14:21:58 UTC (rev 22)
@@ -0,0 +1,59 @@
+// /////////////////////////////////////////////////////////////////////////////
+//
+// Name: TerrainComponent.h
+// Author: Michael Bartsch (ZCCdark203)
+//
+// Desc : Declaration of the TerrainComponent class.
+//
+// License: Copyright (C) 2009 Michael Bartsch
+//
+// This program is free software: you can redistribute it
+// and/or modify it under the terms of the zlib/libpng License.
+// See main.cpp for conditions of distribution and use.
+//
+// /////////////////////////////////////////////////////////////////////////////
+
+#ifndef __TEXTCOMPONENT_H__
+#define __TEXTCOMPONENT_H__
+
+// Include files
+#include "../../dependencies.h"
+#include "SceneComponent.h"
+
+
+// TerrainComponent class
+class TerrainComponent : public SceneComponent
+{
+public:
+
+ // Initialisation and deinitialisation
+ TerrainComponent(Entity *parent);
+ TerrainComponent(Entity *parent, const std::string &fileName,
+ const vector3df &rotation = vector3df(0.0f, 0.0f, 0.0f),
+ const vector3df &scale = vector3df(1.0f, 1.0f, 1.0f),
+ const SColor &vertexColor = SColor(255, 255, 255, 255), int maxLOD = 5,
+ int smoothFactor = 0);
+ ~TerrainComponent();
+
+ // Methods
+ ITerrainSceneNode* getTerrainSceneNode();
+
+ const aabbox3df& getBoundingBox() const;
+ const aabbox3df& getBoundingBox(int patchX, int patchZ) const;
+ float getHeight(float x, float y);
+ IMesh* getMesh();
+ const vector3df& getTerrainCenter() const;
+
+ bool loadHeightMap(const std::string &fileName, const SColor &vertexColor =
+ SColor(255, 255, 255, 255), int smoothFactor = 0);
+
+ void scaleTexture(float scale = 1.0f, float scale2 = 0.0f);
+
+
+private:
+
+ // Members
+ ITerrainSceneNode *mTerrainSN;
+};
+
+#endif
Modified: trunk/src/components/scene/TextBillboardComponent.cpp
===================================================================
--- trunk/src/components/scene/TextBillboardComponent.cpp 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/components/scene/TextBillboardComponent.cpp 2009-05-09 14:21:58 UTC (rev 22)
@@ -34,7 +34,7 @@
// TextBillboardComponent constructor.
TextBillboardComponent::TextBillboardComponent(Entity *parent, const std::string fontFilename,
const wchar_t *text, const dimension2df &size,
- SColor colorTop, SColor colorBottom)
+ const SColor &colorTop, const SColor &colorBottom)
: BillboardComponent(parent, true)
{
ISceneManager *pSceneMgr = GameManager::Instance()->getSceneManager();
@@ -50,7 +50,7 @@
// TextBillboardComponent constructor.
TextBillboardComponent::TextBillboardComponent(Entity *parent, const std::string fontFilename,
const std::string &text, const dimension2df &size,
- SColor colorTop, SColor colorBottom)
+ const SColor &colorTop, const SColor &colorBottom)
: BillboardComponent(parent, true)
{
ISceneManager *pSceneMgr = GameManager::Instance()->getSceneManager();
@@ -96,7 +96,7 @@
}
// Sets the color of the text.
-void TextBillboardComponent::setTextColor(SColor &color)
+void TextBillboardComponent::setTextColor(const SColor &color)
{
mBillboardTextSN->setTextColor(color);
}
Modified: trunk/src/components/scene/TextBillboardComponent.h
===================================================================
--- trunk/src/components/scene/TextBillboardComponent.h 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/components/scene/TextBillboardComponent.h 2009-05-09 14:21:58 UTC (rev 22)
@@ -30,10 +30,12 @@
TextBillboardComponent(Entity *parent);
TextBillboardComponent(Entity *parent, const std::string fontFilename, const wchar_t *text,
const dimension2df &size = dimension2df(10.0f, 10.0f),
- SColor colorTop = 0xFFFFFFFF, SColor colorBottom = 0xFFFFFFFF);
+ const SColor &colorTop = SColor(255, 255, 255, 255),
+ const SColor &colorBottom = SColor(255, 255, 255, 255));
TextBillboardComponent(Entity *parent, const std::string fontFilename, const std::string &text,
const dimension2df &size = dimension2df(10.0f, 10.0f),
- SColor colorTop = 0xFFFFFFFF, SColor colorBottom = 0xFFFFFFFF);
+ const SColor &colorTop = SColor(255, 255, 255, 255),
+ const SColor &colorBottom = SColor(255, 255, 255, 255));
~TextBillboardComponent();
// Methods
@@ -41,7 +43,7 @@
void setText(const std::string &text);
void setText(const wchar_t *text);
- void setTextColor(SColor &color);
+ void setTextColor(const SColor &color);
private:
Modified: trunk/src/components/scene/TextComponent.cpp
===================================================================
--- trunk/src/components/scene/TextComponent.cpp 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/components/scene/TextComponent.cpp 2009-05-09 14:21:58 UTC (rev 22)
@@ -32,7 +32,7 @@
// TextComponent constructor.
TextComponent::TextComponent(Entity *parent, const std::string fontFilename, const wchar_t *text,
- SColor color)
+ const SColor &color)
: SceneComponent(parent, true)
{
ISceneManager *pSceneMgr = GameManager::Instance()->getSceneManager();
@@ -45,7 +45,7 @@
// TextComponent constructor.
TextComponent::TextComponent(Entity *parent, const std::string fontFilename,
- const std::string &text, SColor color)
+ const std::string &text, const SColor &color)
: SceneComponent(parent, true)
{
ISceneManager *pSceneMgr = GameManager::Instance()->getSceneManager();
@@ -88,7 +88,7 @@
}
// Sets the color of the text.
-void TextComponent::setTextColor(SColor &color)
+void TextComponent::setTextColor(const SColor &color)
{
mTextSN->setTextColor(color);
}
Modified: trunk/src/components/scene/TextComponent.h
===================================================================
--- trunk/src/components/scene/TextComponent.h 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/components/scene/TextComponent.h 2009-05-09 14:21:58 UTC (rev 22)
@@ -29,9 +29,9 @@
// Initialisation and deinitialisation
TextComponent(Entity *parent);
TextComponent(Entity *parent, const std::string fontFilename, const wchar_t *text,
- SColor color = SColor(100, 255, 255, 255));
+ const SColor &color = SColor(100, 255, 255, 255));
TextComponent(Entity *parent, const std::string fontFilename, const std::string &text,
- SColor color = SColor(100, 255, 255, 255));
+ const SColor &color = SColor(100, 255, 255, 255));
~TextComponent();
// Methods
@@ -39,7 +39,7 @@
void setText(const std::string &text);
void setText(const wchar_t *text);
- void setTextColor(SColor &color);
+ void setTextColor(const SColor &color);
private:
Modified: trunk/src/sirrf.cbp
===================================================================
--- trunk/src/sirrf.cbp 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/sirrf.cbp 2009-05-09 14:21:58 UTC (rev 22)
@@ -60,6 +60,8 @@
<Unit filename="components/scene/MeshComponent.h" />
<Unit filename="components/scene/SceneComponent.cpp" />
<Unit filename="components/scene/SceneComponent.h" />
+ <Unit filename="components/scene/TerrainComponent.cpp" />
+ <Unit filename="components/scene/TerrainComponent.h" />
<Unit filename="components/scene/TextBillboardComponent.cpp" />
<Unit filename="components/scene/TextBillboardComponent.h" />
<Unit filename="components/scene/TextComponent.cpp" />
Modified: trunk/src/sirrf.depend
===================================================================
--- trunk/src/sirrf.depend 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/sirrf.depend 2009-05-09 14:21:58 UTC (rev 22)
@@ -1039,10 +1039,8 @@
"../dependencies.h"
"Entity.h"
-1241811192 source:/home/michael/Programming/Projects/sirrf/src/core/GameManager.cpp
+1241811704 source:/home/michael/Programming/Projects/sirrf/src/core/GameManager.cpp
"GameManager.h"
- "../components/scene/CameraComponent.h"
- "../components/scene/AnimatedMeshComponent.h"
1241782433 /home/michael/Programming/Projects/sirrf/src/core/GameManager.h
"../dependencies.h"
@@ -1124,27 +1122,27 @@
"../../dependencies.h"
"../../core/EntityComponent.h"
-1241624983 source:/home/michael/Programming/Projects/sirrf/src/components/scene/BillboardComponent.cpp
+1241877641 source:/home/michael/Programming/Projects/sirrf/src/components/scene/BillboardComponent.cpp
"BillboardComponent.h"
"../../core/GameManager.h"
-1241704016 /home/michael/Programming/Projects/sirrf/src/components/scene/BillboardComponent.h
+1241878517 /home/michael/Programming/Projects/sirrf/src/components/scene/BillboardComponent.h
"../../dependencies.h"
"SceneComponent.h"
-1241639972 source:/home/michael/Programming/Projects/sirrf/src/components/scene/TextBillboardComponent.cpp
+1241877966 source:/home/michael/Programming/Projects/sirrf/src/components/scene/TextBillboardComponent.cpp
"TextBillboardComponent.h"
"../../core/GameManager.h"
-1241625045 /home/michael/Programming/Projects/sirrf/src/components/scene/TextBillboardComponent.h
+1241877966 /home/michael/Programming/Projects/sirrf/src/components/scene/TextBillboardComponent.h
"../../dependencies.h"
"BillboardComponent.h"
-1241804074 source:/home/michael/Programming/Projects/sirrf/src/components/scene/TextComponent.cpp
+1241878343 source:/home/michael/Programming/Projects/sirrf/src/components/scene/TextComponent.cpp
"TextComponent.h"
"../../core/GameManager.h"
-1241704067 /home/michael/Programming/Projects/sirrf/src/components/scene/TextComponent.h
+1241878343 /home/michael/Programming/Projects/sirrf/src/components/scene/TextComponent.h
"../../dependencies.h"
"SceneComponent.h"
@@ -1152,7 +1150,7 @@
"MeshComponent.h"
"../../core/GameManager.h"
-1241783055 /home/michael/Programming/Projects/sirrf/src/components/scene/MeshComponent.h
+1241874442 /home/michael/Programming/Projects/sirrf/src/components/scene/MeshComponent.h
"../../dependencies.h"
"SceneComponent.h"
@@ -1162,27 +1160,35 @@
1241639151 source:/home/michael/Programming/Projects/sirrf/src/core/support.cpp
"support.h"
-1241804068 source:/home/michael/Programming/Projects/sirrf/src/components/scene/LightComponent.cpp
+1241877831 source:/home/michael/Programming/Projects/sirrf/src/components/scene/LightComponent.cpp
"LightComponent.h"
"../../core/GameManager.h"
-1241703952 /home/michael/Programming/Projects/sirrf/src/components/scene/LightComponent.h
+1241877831 /home/michael/Programming/Projects/sirrf/src/components/scene/LightComponent.h
"../../dependencies.h"
"SceneComponent.h"
-1241786189 source:/home/michael/Programming/Projects/sirrf/src/components/scene/AnimatedMeshComponent.cpp
+1241877529 source:/home/michael/Programming/Projects/sirrf/src/components/scene/AnimatedMeshComponent.cpp
"AnimatedMeshComponent.h"
"../../core/GameManager.h"
-1241785924 /home/michael/Programming/Projects/sirrf/src/components/scene/AnimatedMeshComponent.h
+1241877528 /home/michael/Programming/Projects/sirrf/src/components/scene/AnimatedMeshComponent.h
"../../dependencies.h"
"SceneComponent.h"
-1241811159 source:/home/michael/Programming/Projects/sirrf/src/components/scene/CameraComponent.cpp
+1241877765 source:/home/michael/Programming/Projects/sirrf/src/components/scene/CameraComponent.cpp
"CameraComponent.h"
"../../core/GameManager.h"
-1241811159 /home/michael/Programming/Projects/sirrf/src/components/scene/CameraComponent.h
+1241877765 /home/michael/Programming/Projects/sirrf/src/components/scene/CameraComponent.h
"../../dependencies.h"
"SceneComponent.h"
+1241877128 source:/home/michael/Programming/Projects/sirrf/src/components/scene/TerrainComponent.cpp
+ "TerrainComponent.h"
+ "../../core/GameManager.h"
+
+1241877128 /home/michael/Programming/Projects/sirrf/src/components/scene/TerrainComponent.h
+ "../../dependencies.h"
+ "SceneComponent.h"
+
Modified: trunk/src/sirrf.layout
===================================================================
--- trunk/src/sirrf.layout 2009-05-09 13:09:25 UTC (rev 21)
+++ trunk/src/sirrf.layout 2009-05-09 14:21:58 UTC (rev 22)
@@ -1,26 +1,32 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="linux-release" />
- <File name="components/scene/AnimatedMeshComponent.cpp" open="1" top="1" tabpos="1">
+ <File name="components/scene/AnimatedMeshComponent.cpp" open="0" top="0" tabpos="1">
<Cursor position="5966" topLine="21" />
</File>
<File name="components/scene/AnimatedMeshComponent.h" open="0" top="0" tabpos="0">
- <Cursor position="1710" topLine="21" />
+ <Cursor position="1710" topLine="0" />
</File>
<File name="components/scene/BillboardComponent.cpp" open="0" top="0" tabpos="0">
- <Cursor position="1548" topLine="15" />
+ <Cursor position="1548" topLine="18" />
</File>
<File name="components/scene/BillboardComponent.h" open="0" top="0" tabpos="0">
<Cursor position="1208" topLine="11" />
</File>
+ <File name="components/scene/CameraComponent.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="3106" topLine="84" />
+ </File>
+ <File name="components/scene/CameraComponent.h" open="0" top="0" tabpos="0">
+ <Cursor position="1243" topLine="30" />
+ </File>
<File name="components/scene/LightComponent.cpp" open="0" top="0" tabpos="0">
- <Cursor position="0" topLine="48" />
+ <Cursor position="1590" topLine="15" />
</File>
<File name="components/scene/LightComponent.h" open="0" top="0" tabpos="0">
<Cursor position="0" topLine="9" />
</File>
<File name="components/scene/MeshComponent.cpp" open="0" top="0" tabpos="0">
- <Cursor position="2722" topLine="0" />
+ <Cursor position="1000" topLine="0" />
</File>
<File name="components/scene/MeshComponent.h" open="0" top="0" tabpos="0">
<Cursor position="1430" topLine="9" />
@@ -32,16 +38,16 @@
<Cursor position="957" topLine="4" />
</File>
<File name="components/scene/TextBillboardComponent.cpp" open="0" top="0" tabpos="0">
- <Cursor position="3618" topLine="61" />
+ <Cursor position="3618" topLine="0" />
</File>
<File name="components/scene/TextBillboardComponent.h" open="0" top="0" tabpos="2">
<Cursor position="1563" topLine="9" />
</File>
<File name="components/scene/TextComponent.cpp" open="0" top="0" tabpos="0">
- <Cursor position="0" topLine="32" />
+ <Cursor position="2553" topLine="0" />
</File>
<File name="components/scene/TextComponent.h" open="0" top="0" tabpos="0">
- <Cursor position="1411" topLine="8" />
+ <Cursor position="0" topLine="8" />
</File>
<File name="core/DataStack.cpp" open="0" top="0" tabpos="0">
<Cursor position="5904" topLine="222" />
@@ -80,7 +86,7 @@
<Cursor position="707" topLine="27" />
</File>
<File name="core/GameManager.cpp" open="0" top="0" tabpos="1">
- <Cursor position="860" topLine="0" />
+ <Cursor position="860" topLine="3" />
</File>
<File name="core/GameManager.h" open="0" top="0" tabpos="0">
<Cursor position="1901" topLine="30" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
