Made changes to properly isolate new unit rotation code so that it is disabled by default

source/shared_lib/include/graphics/model.h

@@ -0,0 +1,172 @@
+// ==============================================================
+//	This file is part of Glest Shared Library (www.glest.org)
+//
+//	Copyright (C) 2001-2008 Marti<74>o Figueroa
+//
+//	You can redistribute this code and/or modify it under
+//	the terms of the GNU General Public License as published
+//	by the Free Software Foundation; either version 2 of the
+//	License, or (at your option) any later version
+// ==============================================================
+
+#ifndef _SHARED_GRAPHICS_MODEL_H_
+#define _SHARED_GRAPHICS_MODEL_H_
+
+#include <string>
+#include <map>
+
+#include "types.h"
+#include "pixmap.h"
+#include "texture_manager.h"
+#include "texture.h"
+#include "model_header.h"
+
+using std::string;
+using std::map;
+using std::pair;
+
+namespace Shared{ namespace Graphics{
+
+class Model;
+class Mesh;
+class ShadowVolumeData;
+class InterpolationData;
+class TextureManager;
+
+// =====================================================
+//	class Mesh
+//
+//	Part of a 3D model
+// =====================================================
+
+class Mesh{
+private:
+	//mesh data
+	Texture2D *textures[meshTextureCount];
+	string texturePaths[meshTextureCount];
+
+	//vertex data counts
+	uint32 frameCount;
+	uint32 vertexCount;
+	uint32 indexCount;
+
+	//vertex data
+	Vec3f *vertices;
+	Vec3f *normals;
+	Vec2f *texCoords;
+	Vec3f *tangents;
+	uint32 *indices;
+
+	//material data
+	Vec3f diffuseColor;
+	Vec3f specularColor;
+	float specularPower;
+	float opacity;
+
+	//properties
+	bool twoSided;
+	bool customColor;
+
+	InterpolationData *interpolationData;
+
+public:
+	//init & end
+	Mesh();
+	~Mesh();
+	void init();
+	void end();
+
+	//maps
+	const Texture2D *getTexture(int i) const	{return textures[i];}
+
+	//counts
+	uint32 getFrameCount() const			{return frameCount;}
+	uint32 getVertexCount() const			{return vertexCount;}
+	uint32 getIndexCount() const			{return indexCount;}
+	uint32 getTriangleCount() const;
+
+	//data
+	const Vec3f *getVertices() const 	{return vertices;}
+	const Vec3f *getNormals() const 	{return normals;}
+	const Vec2f *getTexCoords() const	{return texCoords;}
+	const Vec3f *getTangents() const	{return tangents;}
+	const uint32 *getIndices() const 	{return indices;}
+
+	//material
+	const Vec3f &getDiffuseColor() const	{return diffuseColor;}
+	const Vec3f &getSpecularColor() const	{return specularColor;}
+	float getSpecularPower() const			{return specularPower;}
+	float getOpacity() const				{return opacity;}
+
+	//properties
+	bool getTwoSided() const		{return twoSided;}
+	bool getCustomTexture() const	{return customColor;}
+
+	//external data
+	const InterpolationData *getInterpolationData() const	{return interpolationData;}
+
+	//interpolation
+	void buildInterpolationData();
+	void updateInterpolationData(float t, bool cycle) const;
+	void updateInterpolationVertices(float t, bool cycle) const;
+
+	//load
+	void loadV2(const string &dir, FILE *f, TextureManager *textureManager);
+	void loadV3(const string &dir, FILE *f, TextureManager *textureManager);
+	void load(const string &dir, FILE *f, TextureManager *textureManager);
+	void save(const string &dir, FILE *f);
+
+private:
+	void computeTangents();
+};
+
+// =====================================================
+//	class Model
+//
+//	3D Model, than can be loaded from a g3d file
+// =====================================================
+
+class Model{
+private:
+	TextureManager *textureManager;
+
+private:
+	uint8 fileVersion;
+	uint32 meshCount;
+	Mesh *meshes;
+
+public:
+	//constructor & destructor
+	Model();
+	virtual ~Model();
+	virtual void init()= 0;
+	virtual void end()= 0;
+
+	//data
+	void updateInterpolationData(float t, bool cycle) const;
+	void updateInterpolationVertices(float t, bool cycle) const;
+	void buildShadowVolumeData() const;
+
+	//get
+	uint8 getFileVersion() const		{return fileVersion;}
+	uint32 getMeshCount() const			{return meshCount;}
+	const Mesh *getMesh(int i) const	{return &meshes[i];}
+
+	uint32 getTriangleCount() const;
+	uint32 getVertexCount() const;
+
+	//io
+	void load(const string &path);
+	void save(const string &path);
+	void loadG3d(const string &path);
+	void saveS3d(const string &path);
+
+	void setTextureManager(TextureManager *textureManager)	{this->textureManager= textureManager;}
+
+private:
+	void buildInterpolationData() const;
+};
+
+}}//end namespace
+
+#endif

source/shared_lib/include/util/properties.h

@@ -0,0 +1,80 @@
+// ==============================================================
+//	This file is part of Glest Shared Library (www.glest.org)
+//
+//	Copyright (C) 2001-2008 Marti<74>o Figueroa
+//
+//	You can redistribute this code and/or modify it under
+//	the terms of the GNU General Public License as published
+//	by the Free Software Foundation; either version 2 of the
+//	License, or (at your option) any later version
+// ==============================================================
+
+#ifndef _SHARED_UTIL_PROPERTIES_H_
+#define _SHARED_UTIL_PROPERTIES_H_
+
+#include <string>
+#include <map>
+#include <vector>
+
+using std::map;
+using std::vector;
+using std::string;
+using std::pair;
+
+namespace Shared{ namespace Util{
+
+// =====================================================
+//	class Properties
+//
+///	ini-like file loader
+// =====================================================
+
+class Properties{
+private:
+	static const int maxLine= 1024;
+
+public:
+	typedef pair<string, string> PropertyPair;
+	typedef map<string, string> PropertyMap;
+	typedef vector<PropertyPair> PropertyVector;
+
+private:
+	PropertyVector propertyVector;
+	PropertyMap propertyMap;
+	string path;
+
+public:
+	void clear();
+	void load(const string &path);
+	void save(const string &path);
+
+	int getPropertyCount()	{return propertyVector.size();}
+	string getKey(int i)	{return propertyVector[i].first;}
+	string getString(int i)	{return propertyVector[i].second;}
+
+	bool getBool(const string &key, const char *defaultValueIfNotFound=NULL) const;
+	int getInt(const string &key, const char *defaultValueIfNotFound=NULL) const;
+	int getInt(const string &key, int min, int max, const char *defaultValueIfNotFound=NULL) const;
+	float getFloat(const string &key, const char *defaultValueIfNotFound=NULL) const;
+	float getFloat(const string &key, float min, float max, const char *defaultValueIfNotFound=NULL) const;
+
+	const string getString(const string &key, const char *defaultValueIfNotFound=NULL) const;
+
+	int getInt(const char *key,const char *defaultValueIfNotFound=NULL) const;
+	bool getBool(const char *key,const char *defaultValueIfNotFound=NULL) const;
+	float getFloat(const char *key,const char *defaultValueIfNotFound=NULL) const;
+	const string getString(const char *key,const char *defaultValueIfNotFound=NULL) const;
+
+	void setInt(const string &key, int value);
+	void setBool(const string &key, bool value);
+	void setFloat(const string &key, float value);
+	void setString(const string &key, const string &value);
+
+	string toString();
+
+
+};
+
+}}//end namespace
+
+#endif