Removed files

ChangeLog

@@ -5,6 +5,12 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140107 ]
+	* Removed even more unused files (mstl/Vector.cpp)
+	* Removed hel/Simulation, as it depends on missing files
+	  (hel/CollisionObject)
+	* Improved Makefile portability
+
 	[ 20140106 ]
 	* Hel Simulation Test builds, but doesn't work!
 

Makefile

@@ -46,18 +46,20 @@ AUDIO_LIBS += -lalut
 AUDIO_LIBS += -framework OpenAL
 AUDIO_LIBS += -L/usr/local/lib
 AUDIO_DEFS += -I/usr/local/include
-BASE_LIBS += -L/opt/local/lib
-BASE_DEFS += -I/opt/local/include
-BASE_LIBS += -framework OpenGL
-BASE_LIBS += -framework GLUT
+GL_LIBS += -framework OpenGL
+GL_LIBS += -L/opt/local/lib
+GL_DEFS += -I/opt/local/include
 else
 AUDIO_LIBS += -lopenal
-BASE_LIBS += -L/usr/local/lib
-BASE_DEFS += -I/usr/local/include
+GL_LIBS += -lGL -lGLU
+GL_LIBS += -L/usr/local/lib
+GL_DEFS += -I/usr/local/include
 endif
 
 BASE_LIBS += $(AUDIO_LIBS)
+BASE_LIBS += $(GL_LIBS)
 BASE_DEFS += $(AUDIO_DEFS)
+BASE_DEFS += $(GL_DEFS)
 
 # libferit, File transfer via HTTP/FTP/etc support
 LIBFERIT_LIB=/usr/local/lib/libferit.so
@@ -97,10 +99,6 @@ BASE_CFLAGS=-Wall $(BASE_DEFS) \
 LD_FLAGS=-L/usr/X11/lib -lXmu -lXt -lSM -lICE -lXext -lX11 -lXi \
 	 -lm $(BASE_LIBS)
 
-ifneq ($(UNAME),Darwin)
-LD_FLAGS+=-lGL -lGLU
-endif
-
 RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
 	-fomit-frame-pointer -O2
 
@@ -180,16 +178,13 @@ depend:
 # Later hel will become a seperate library once it matures
 HEL_OBJ = \
 	$(BUILDDIR)/Mass.o \
-	$(BUILDDIR)/Simulation.o \
 	$(BUILDDIR)/Vector3d.o \
 	$(BUILDDIR)/Matrix.o \
 	$(BUILDDIR)/ViewVolume.o \
-	$(BUILDDIR)/CollisionObject.o \
 	$(BUILDDIR)/BoundingVolume.o \
 	$(BUILDDIR)/Quaternion.o \
 	$(BUILDDIR)/math.o \
 	$(BUILDDIR)/Entity.o
-	#$(BUILDDIR)/Spring.o
 
 OBJS = \
 	$(DEBUG_OBJ) \
@@ -309,90 +304,13 @@ TombRaider.test:
 
 #################################################################
 
-ifeq ($(UNAME),Darwin)
 GLString.test:
 	mkdir -p $(BUILD_TEST_DIR)
 	$(CC) -Wall -Isrc -D__TEST__ -DHAVE_MTK -DHAVE_SDL -DUSING_MTK_TGA \
 	$(shell sdl-config --cflags) $(shell sdl-config --libs) \
-	-I/opt/local/include -I/usr/local/include \
-	-framework OpenGL \
-	-framework GLUT \
-	-lm -lstdc++ \
+	$(GL_LIBS) $(GL_DEFS) -lm -lstdc++ \
 	src/Texture.cpp src/mtk_tga.cpp \
 	src/GLString.cpp -o $(BUILD_TEST_DIR)/GLString.test
-else
-GLString.test:
-	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) -Wall -Isrc -D__TEST__ -DHAVE_MTK -DHAVE_SDL -DUSING_MTK_TGA \
-	$(shell sdl-config --cflags) $(shell sdl-config --libs) \
-	-lGL -lGLU -lm \
-	src/Texture.cpp src/mtk_tga.cpp \
-	src/GLString.cpp -o $(BUILD_TEST_DIR)/GLString.test
-endif
-
-#################################################################
-
-# CollisionObject and HeightCollisionObject seem to be missing?
-# -- xythobuz, 2014-01-04
-
-SIMULATION_CFLAGS=-Wall -O0 -g -Isrc $(shell sdl-config --cflags) \
-		-I/opt/local/include \
-		-DUSING_OPENGL -DUSING_HEL -DUSING_MTK_TGA \
-		-DUNIT_TEST_SIMULATION
-SIMULATION_OBJS=$(BUILD_TEST_DIR)/mtk_tga.o $(BUILD_TEST_DIR)/Texture.o \
-		$(BUILD_TEST_DIR)/Mass.o \
-		$(BUILD_TEST_DIR)/CollisionObject.o \
-		$(BUILD_TEST_DIR)/Simulation.o \
-		$(BUILD_TEST_DIR)/Vector3d.o \
-		$(BUILD_TEST_DIR)/Matrix.o \
-		$(BUILD_TEST_DIR)/ViewVolume.o \
-		$(BUILD_TEST_DIR)/BoundingVolume.o \
-		$(BUILD_TEST_DIR)/Quaternion.o \
-		$(BUILD_TEST_DIR)/math.o
-
-ifeq ($(UNAME),Darwin)
-Simulation.test:
-	mkdir -p $(BUILD_TEST_DIR)
-	$(MAKE) targets NAME=Simulation.test BUILDDIR=$(BUILD_TEST_DIR) \
-		OBJS="$(SIMULATION_OBJS)" \
-		CFLAGS="$(SIMULATION_CFLAGS)" \
-		LD_FLAGS="-lm -lstdc++ -lSDL_ttf -lSDL -framework OpenGL -framework GLUT $(shell sdl-config --libs)"
-else
-Simulation.test:
-	mkdir -p $(BUILD_TEST_DIR)
-	$(MAKE) targets NAME=Simulation.test BUILDDIR=$(BUILD_TEST_DIR) \
-		OBJS="$(SIMULATION_OBJS)" \
-		CFLAGS="$(SIMULATION_CFLAGS)" \
-		LD_FLAGS="-lm -lstdc++ -lSDL_ttf -lSDL -lGL -lGLU $(shell sdl-config --libs)"
-endif
-
-#################################################################
-
-# Spring files seem to be missing?
-# -- xythobuz, 2014-01-04
-
-HEL_PARTICLE_CFLAGS=-Wall -O0 -g -Isrc $(shell sdl-config --cflags) \
-		-I/opt/local/include \
-		-DUSING_OPENGL -DUSING_HEL -DUSING_MTK_TGA \
-		-DUNIT_TEST_SPRING -DHAVE_SDL_TTF
-HEL_PARTICLE_OBJS=$(BUILD_TEST_DIR)/mtk_tga.o $(BUILD_TEST_DIR)/Texture.o \
-		$(BUILD_TEST_DIR)/Mass.o \
-		$(BUILD_TEST_DIR)/Spring.o \
-		$(BUILD_TEST_DIR)/CollisionObject.o \
-		$(BUILD_TEST_DIR)/Simulation.o \
-		$(BUILD_TEST_DIR)/Vector3d.o \
-		$(BUILD_TEST_DIR)/Matrix.o \
-		$(BUILD_TEST_DIR)/ViewVolume.o \
-		$(BUILD_TEST_DIR)/BoundingVolume.o \
-		$(BUILD_TEST_DIR)/Quaternion.o \
-		$(BUILD_TEST_DIR)/math.o
-
-Spring.test:
-	mkdir -p $(BUILD_TEST_DIR)
-	$(MAKE) targets NAME=Spring.test BUILDDIR=$(BUILD_TEST_DIR) \
-		OBJS="$(HEL_PARTICLE_OBJS)" \
-		CFLAGS="$(HEL_PARTICLE_CFLAGS)" \
-		LD_FLAGS="-lm -lstdc++ -lSDL_ttf-lGL -lGLU $(shell sdl-config --libs)"
 
 #################################################################
 

src/hel/CollisionObject.cpp

@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
-/*================================================================
- *
- * Project : libHel
- * Object  : CollisionObject
- * Comments: Was missing from SourceForge!
- *
- *-- History ------------------------------------------------
- *
- * 2013.12.27:
- * xythobuz - Created as stub, was missing
- ================================================================*/
-
-#include "CollisionObject.h"
-
-
-////////////////////////////////////////////////////////////
-// Constructors
-////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////
-// Public Accessors
-////////////////////////////////////////////////////////////
-
-bool CollisionObject::intersectPoint(Vector3d p) {
-    return 0;
-}
-
-////////////////////////////////////////////////////////////
-// Public Mutators
-////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////
-// Private Accessors
-////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////
-// Private Mutators
-////////////////////////////////////////////////////////////
-
-
-HeightCollisionObject::HeightCollisionObject(int a, int b) {
-
-}

src/hel/CollisionObject.h

@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
-/*================================================================
- *
- * Project : libHel
- * Object  : CollisionObject
- * Comments: Was missing from SourceForge!
- *
- *-- History ------------------------------------------------
- *
- * 2013.12.27:
- * xythobuz - Created as stub, was missing
- ================================================================*/
-
-
-#ifndef GUARD__LIBHEL_MONGOOSE_COLLISIONOBJECT_H_
-#define GUARD__LIBHEL_MONGOOSE_COLLISIONOBJECT_H_
-
-#include <hel/Vector3d.h>
-
-class CollisionObject
-{
- public:
-
-	////////////////////////////////////////////////////////////
-	// Constructors
-	////////////////////////////////////////////////////////////
-
-
-	////////////////////////////////////////////////////////////
-	// Public Accessors
-	////////////////////////////////////////////////////////////
-
-    bool intersectPoint(Vector3d p);
-
-	////////////////////////////////////////////////////////////
-	// Public Mutators
-	////////////////////////////////////////////////////////////
-
-    Vector3d mIntersection;
-
-
- private:
-
-	////////////////////////////////////////////////////////////
-	// Private Accessors
-	////////////////////////////////////////////////////////////
-
-
-	////////////////////////////////////////////////////////////
-	// Private Mutators
-	////////////////////////////////////////////////////////////
-
-
-	/* */
-};
-
-class HeightCollisionObject : public CollisionObject {
-public:
-    HeightCollisionObject(int a, int b);
-};
-
-#endif

src/hel/Simulation.cpp

@@ -1,453 +0,0 @@
-/* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
-/*================================================================
- *
- * Project : Hel
- * Author  : Terry 'Mongoose' Hendrix II
- * Website : http://www.westga.edu/~stu7440/
- * Email   : stu7440@westga.edu
- * Object  : Simulation
- * License : No use w/o permission (C) 2003 Mongoose
- * Comments: This class simulates mass physics
- *
- *
- *           This file was generated using Mongoose's C++
- *           template generator script.  <stu7440@westga.edu>
- *
- *-- History -------------------------------------------------
- *
- * 2003.06.02:
- * Mongoose - Created, based on algorithms from Erkin Tunca
- =================================================================*/
-
-#include <math.h>
-#include "Simulation.h"
-
-
-////////////////////////////////////////////////////////////
-// Constructors
-////////////////////////////////////////////////////////////
-
-Simulation::Simulation()
-{
-	mMassCount = 0;
-}
-
-
-Simulation::~Simulation()
-{
-	clear();
-}
-
-
-////////////////////////////////////////////////////////////
-// Public Accessors
-////////////////////////////////////////////////////////////
-
-Mass *Simulation::getMass(unsigned int i)
-{
-	return mMasses[i];
-}
-
-
-////////////////////////////////////////////////////////////
-// Public Mutators
-////////////////////////////////////////////////////////////
-
-void Simulation::attachCollisionObject(CollisionObject *obj)
-{
-	mObjects.pushBack(obj);
-}
-
-
-void Simulation::clear()
-{
-	mMasses.erase();
-}
-
-
-bool Simulation::collisionDetected(Mass *mass)
-{
-	bool detected = false;
-
-	for (mObjects.start(); mObjects.forward(); mObjects.next())
-	{
-		if ((mObjects.current())->intersectPoint(mass->mPos))
-		{
-			detected = true;
-			resolveCollision(mass, mObjects.current());
-		}
-	}
-
-	return detected;
-}
-
-
-void Simulation::generateMasses(unsigned int count, vec_t mass)
-{
-	generateMasses(count, mass, Vector3d(0, 0, 0), Vector3d(0, 0, 0));
-}
-
-
-void Simulation::generateMasses(unsigned int count, vec_t mass,
-										  const Vector3d &position,
-										  const Vector3d &velocity)
-{
-	unsigned int i;
-
-
-	mMassCount = count;
-	//mMasses.reserve(mMasses.size() + count);
-
-	for (i = 0; i < count; ++i)
-	{
-		mMasses.pushBack(new Mass(mass, position, velocity));
-	}
-}
-
-
-void Simulation::init()
-{
-	Mass *m;
-
-	for (mMasses.start(); mMasses.forward(); mMasses.next())
-	{
-		m = mMasses.current();
-
-		if (!m)
-			continue;
-
-		m->rest();
-	}
-}
-
-
-void Simulation::resolveCollision(Mass *mass, CollisionObject *obj)
-{
-	mass->mPos = obj->mIntersection;
-}
-
-
-void Simulation::run(vec_t timeDelta)
-{
-	// Reset forces
-	init();
-
-	// Apply external forces
-	solve();
-
-	// Update change in time
-	simulate(timeDelta);
-}
-
-
-void Simulation::simulate(vec_t timeDelta)
-{
-	Mass *m;
-
-	for (mMasses.start(); mMasses.forward(); mMasses.next())
-	{
-		m = mMasses.current();
-
-		if (!m)
-			continue;
-
-		m->simulate(timeDelta);
-	}
-}
-
-
-void Simulation::solve()
-{
-}
-
-
-////////////////////////////////////////////////////////////
-// Private Accessors
-////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////
-// Private Mutators
-////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////
-// Unit Test code
-////////////////////////////////////////////////////////////
-
-#ifdef UNIT_TEST_SIMULATION
-
-#define SDL_UNIT_TEST
-#include "SDLUnitTest.cpp"
-
-Simulation *gEmitter;
-GravitySimulation gGravityEmitter;
-SpringSimulation gSpringEmitter;
-SpringSimulation gSpringEmitter2;
-bool gOn = false;
-float gSpeed = 0.1f;
-
-
-// Draw particles
-#define ENABLE_TEX_PARTICLES
-void renderScene(float time, float lastTime)
-{
-	Mass *m;
-	Vector3d last;
-	vec_t x, y, z;
-
-	glBindTexture(GL_TEXTURE_2D, 1);
-
-	if (gOn)
-		gEmitter->run((time - lastTime) * 0.1 * gSpeed); // slow it down
-
-#ifdef ENABLE_TEX_PARTICLES
-	// Alpha is determined by life, which is affected by blend amount
-	//glColor4f(mColor, g, b, life);
-
-	// Render tristrip quad
-	for (gEmitter->mMasses.start(); gEmitter->mMasses.forward();
-		  gEmitter->mMasses.next())
-	{
-		m = gEmitter->mMasses.current();
-
-		if (!m)
-			continue;
-
-		if (gEmitter == &gSpringEmitter)
-		{
-			if (gEmitter->mMasses.getCurrentIndex() == 0)
-			{
-				glDisable(GL_TEXTURE_2D);
-
-				glColor4f(0.0, 1.0, 0.0, 1.0);
-				glBegin(GL_POINTS);
-				glVertex3fv(gSpringEmitter.connectionPos.mVec);
-				glEnd();
-			}
-
-			glColor4f(gEmitter->mMasses.getCurrentIndex()*0.33, 0.0, 1.0, 1.0);
-			glBegin(GL_POINTS);
-			glVertex3fv(m->mPos.mVec);
-			glEnd();
-			glBegin(GL_LINES);
-			glVertex3fv(m->mPos.mVec);
-			glVertex3fv(gSpringEmitter.connectionPos.mVec);
-			glEnd();
-		}
-		else
-		{
-			x = m->mPos.mVec[0];
-			y = m->mPos.mVec[1];
-			z = m->mPos.mVec[2];
-
-			glBegin(GL_TRIANGLE_STRIP);
-
-			glTexCoord2d(1.0, 1.0);
-			glVertex3f(x + 25, y + 25, z);
-
-			glTexCoord2d(0.0, 1.0);
-			glVertex3f(x - 25, y + 25, z);
-
-			glTexCoord2d(1.0, 0.0);
-			glVertex3f(x + 25, y - 25, z);
-
-			glTexCoord2d(0.0, 0.0);
-			glVertex3f(x - 25, y - 25, z);
-
-			glEnd();
-		}
-	}
-
-#else
-	glBegin(GL_POINTS);
-
-	for (gEmitter.mMasses.start(); gEmitter.mMasses.forward();
-		  gEmitter.mMasses.next())
-	{
-		m = gEmitter.mMasses.current();
-
-		if (!m)
-			continue;
-
-		glColor4f(0.0, 1.0, 1.0, 1.0);
-		glVertex3fv(m->mPos.mVec);
-	}
-
-	glEnd();
-#endif
-}
-
-
-void handleKey(int key)
-{
-	Mass *m;
-
-	switch (key)
-	{
-	case ' ':
-		m = gGravityEmitter.getMass(0);
-
-		if (m)
-		{
-			m->mVelocity = Vector3d(0.0f, 120.0f, 0.0f);
-		}
-		break;
-	case 'r':
-		gGravityEmitter.clear();
-
-		gGravityEmitter.generateMasses(1, 1.0f,
-												 Vector3d(0.0f, 0.0f, 0.0f),
-												 Vector3d(0.0f, 96.0f, -64.0f));
-		gGravityEmitter.generateMasses(1, 1.0f,
-												 Vector3d(-128.0f, 0.0f, 0.0f),
-												 Vector3d(32.0f, 96.0f, 0.0f));
-		gGravityEmitter.generateMasses(1, 1.0f,
-												 Vector3d(128.0f, 0.0f, 0.0f),
-												 Vector3d(-32.0f, 96.0f, 0.0f));
-		break;
-	case 't':
-		if (gEmitter == &gGravityEmitter)
-		{
-			gEmitter = &gSpringEmitter;
-		}
-		else
-		{
-			gEmitter = &gGravityEmitter;
-		}
-		break;
-	case 'f':
-		gGravityEmitter.gravitation *= 10.0;
-		printf("G is now %f\n", gGravityEmitter.gravitation.mVec[1]);
-		break;
-	case 'g':
-		if (fabs(gGravityEmitter.gravitation.mVec[1] * 0.1) > 0.0000001)
-			gGravityEmitter.gravitation *= 0.1;
-
-		printf("G is now %f\n", gGravityEmitter.gravitation.mVec[1]);
-		break;
-	case 's':
-		gOn = !gOn;
-		break;
-	case '[':
-		gSpringEmitter.springConstant += 0.5f;
-		printf("Spring constant = %f\n", gSpringEmitter.springConstant);
-		break;
-	case ']':
-		if (gSpringEmitter.springConstant - 0.5 > 0.0f)
-			gSpringEmitter.springConstant -= 0.5f;
-		printf("Spring constant = %f\n", gSpringEmitter.springConstant);
-		break;
-	case '.':
-		gSpeed *= 10.0;
-		printf("Time is at %f speed\n", gSpeed);
-		break;
-	case ',':
-		if (gSpeed * 0.1 > 0.0000001)
-			gSpeed *= 0.1;
-		printf("Time is at %f speed\n", gSpeed);
-		break;
-	case 'h':
-		printf("\n");
-		printf("----------------------------------\n");
-		printf("t -       Toggle emitter\n");
-		printf("r -       Reset gravity emitter test\n");
-		printf("[ ] -     Adjust spring stiffness\n");
-		printf(", . -     Adjust time delta\n");
-		printf("g -       Scale gravity down\n");
-		printf("f -       Scale gravity up\n");
-		printf("s -       Start/stop simulation\n");
-		break;
-	}
-}
-
-
-void handleArgKey(char key)
-{
-	switch (key)
-	{
-	default:
-		;
-	}
-}
-
-
-void initScene(int argc, char *argv[])
-{
-	//glEnable(GL_CULL_FACE);
-	//glCullFace(GL_FRONT);    // Q3A uses front face culling
-	glEnable(GL_TEXTURE_2D);
-	glEnable(GL_DEPTH_TEST);
-	glDepthFunc(GL_LESS);
-	glShadeModel(GL_SMOOTH);
-	glDisable(GL_LIGHTING);
-
-	glPointSize(5.0f);
-	gYawOn = false;
-	gScale = 0.3f;
-
-	// Texture setup
-	gTexture.reset();
-	gTexture.setFlag(Texture::fUseMipmaps);
-	gTexture.setMaxTextureCount(64);
-	printf("Loading textures: ");
-	gTexture.loadTGA("data/snow.tga");
-	gTexture.loadTGA("data/snow2.tga");
-	printf(" done\n\n");
-}
-
-
-int runSimulationUnitTest(int argc, char *argv[])
-{
-	gEmitter = &gGravityEmitter;
-
-	// Masses created above the origin, traveling down on Y axis
-	// as if it where in a vacuum pulled by gravity
-	gGravityEmitter.generateMasses(1, 1.0f,
-											 Vector3d(0.0f, 0.0f, 0.0f),
-											 Vector3d(0.0f, 96.0f, 0.0f));
-	gGravityEmitter.generateMasses(1, 1.0f,
-											 Vector3d(-64.0f, 1424.0f, 0.0f),
-											 Vector3d(-9.8f, 0.0f, 0.0f));
-	gGravityEmitter.generateMasses(1, 1.0f,
-											 Vector3d(64.0f, 1424.0f, 0.0f),
-											 Vector3d(9.8f, 0.0f, 0.0f));
-
-	//InternalBBoxCollisionObject *obj =
-	//new InternalBBoxCollisionObject(-9999, 0, -9999,
-	//										 9999, 9999, 9999);
-
-	HeightCollisionObject *obj = new HeightCollisionObject(0, 9999);
-
-	/* Don't fall out ot the box world  =) */
-	gGravityEmitter.attachCollisionObject(obj);
-	gSpringEmitter.attachCollisionObject(obj);
-
-	// Spring
-	gSpringEmitter.connectionPos = Vector3d(0.0f, 200.0f, 0.0f);
-	gSpringEmitter.springConstant = 0.3f;
-	gSpringEmitter.generateMasses(1, 0.5f,
-											Vector3d(0.0f, -512.0f, 0.0f),
-											Vector3d(3.0f, 0.0f, 0.0f));
-	gSpringEmitter.generateMasses(1, 0.5f,
-											Vector3d(-512.0f, -128.0f, 0.0f),
-											Vector3d(0.0f, 3.0f, 0.0f));
-	gSpringEmitter.generateMasses(1, 0.5f,
-											Vector3d(512.0f, -128.0f, 0.0f),
-											Vector3d(0.0f, 0.0f, 0.3f));
-
-	updateWindowTitle("[Simulation particle class test]");
-	runSDLUnitTest(argc, argv);
-
-	return 0;
-}
-
-
-int main(int argc, char *argv[])
-{
-	printf("[Simulation class test]\n");
-	runSimulationUnitTest(argc, argv);
-
-	return 0;
-}
-#endif

src/hel/Simulation.h

@@ -1,308 +0,0 @@
-/* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
-/*================================================================
- *
- * Project : Hel
- * Author  : Terry 'Mongoose' Hendrix II
- * Website : http://www.westga.edu/~stu7440/
- * Email   : stu7440@westga.edu
- * Object  : Simulation
- * License : No use w/o permission (C) 2003 Mongoose
- * Comments: This class simulates mass physics
- *
- *
- *           This file was generated using Mongoose's C++
- *           template generator script.  <stu7440@westga.edu>
- *
- *-- Test Defines -----------------------------------------------
- *
- * UNIT_TEST_SIMULATION - Builds Simulation class as a console unit test
- *
- *-- History ------------------------------------------------
- *
- * 2003.06.08:
- * Mongoose - Generic collision and basic resolution w/o generic
- *            Hel Resolvers
- *
- * 2003.06.02:
- * Mongoose - Created, based on algorithms from Erkin Tunca
- ================================================================*/
-
-
-#ifndef GUARD__HEL_MONGOOSE_SIMULATION_H_
-#define GUARD__HEL_MONGOOSE_SIMULATION_H_
-
-#include <mstl/Vector.h>
-#include <hel/CollisionObject.h>
-#include <hel/Mass.h>
-#include <hel/math.h>
-
-
-class Simulation
-{
- public:
-
-	////////////////////////////////////////////////////////////
-	// Constructors
-	////////////////////////////////////////////////////////////
-
-	Simulation();
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : Constructs an object of Simulation
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.02:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-	virtual ~Simulation();
-	/*------------------------------------------------------
-	 * Pre  : Simulation object is allocated
-	 * Post : Deconstructs an object of Simulation
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.02:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-
-	////////////////////////////////////////////////////////////
-	// Public Accessors
-	////////////////////////////////////////////////////////////
-
-	Mass *getMass(unsigned int i);
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : Get <i>th Mass element of this simulation
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.02:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-
-	////////////////////////////////////////////////////////////
-	// Public Mutators
-	////////////////////////////////////////////////////////////
-
-	virtual void attachCollisionObject(CollisionObject *obj);
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : Adds <Obj> to the collision list for this simulation
-	 *
-	 * TODO : Allow multiple types of collision to be excluded?
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.08:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-	virtual void clear();
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : Removes all masses from this simulation
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.02:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-	virtual bool collisionDetected(Mass *mass);
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : Returns true if <Mass> collided with object
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.08:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-	virtual void generateMasses(unsigned int count, vec_t mass);
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : <Count> number of masses with <mass> value are added
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.02:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-	virtual void generateMasses(unsigned int count, vec_t mass,
-										 const Vector3d &position,
-										 const Vector3d &velocity);
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : <Count> number of masses with
-	 *        <mass>, <position>, and <velocity> are added
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.02:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-	virtual void init();
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : Reset forces acting on masses
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.02:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-	virtual void resolveCollision(Mass *mass, CollisionObject *obj);
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : Resolves a collision of <Obj> and <Mass>
-	 *
-	 *        The default resolution here is to set mass pos
-	 *        to intersection point with the object, there
-	 *        is no affect on velocity
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.08:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-	virtual void run(vec_t timeDelta);
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : Does full init, solve, simulate cycle
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.02:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-	virtual void simulate(vec_t timeDelta);
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : Update change in time for each mass
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.02:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-	virtual void solve ();
-	/*------------------------------------------------------
-	 * Pre  :
-	 * Post : Have forces act on masses
-	 *
-	 *-- History ------------------------------------------
-	 *
-	 * 2003.06.02:
-	 * Mongoose - Created
-	 ------------------------------------------------------*/
-
-	Vector<Mass *> mMasses;			/* It's a collection of masses, silly */
-
-	Vector<CollisionObject *> mObjects;	/* Object(s) to test collision with */
-
-	unsigned int mMassCount;		/* Cache of number of masses in collection  */
-
-
- private:
-
-	////////////////////////////////////////////////////////////
-	// Private Accessors
-	////////////////////////////////////////////////////////////
-
-
-	////////////////////////////////////////////////////////////
-	// Private Mutators
-	////////////////////////////////////////////////////////////
-};
-
-
-class GravitySimulation : public Simulation
-{
-public:
-
-	GravitySimulation() : Simulation()
-	{
-		gravitation = Vector3d(0.0f, -9.81f, 0.0f);
-	}
-
-
-	virtual void solve()
-	{
-		Mass *m;
-
-		// Apply gravitational force to each mass
-		for (mMasses.start(); mMasses.forward(); mMasses.next())
-		{
-			m = mMasses.current();
-
-			// Gravitational force, Force = (Mass)(Gravity)
-			m->applyForce(gravitation * m->mMass);
-
-			if (collisionDetected(m))
-			{
-				m->mVelocity = Vector3d(0, 0, 0);
-			}
-		}
-	}
-
-
-	Vector3d gravitation;     /* Gravitational acceleration */
-};
-
-
-class SpringSimulation : public Simulation
-{
-public:
-
-	SpringSimulation() : Simulation()
-	{
-	}
-
-
-	virtual void generateMasses(unsigned int count, vec_t mass,
-										 const Vector3d &position,
-										 const Vector3d &velocity)
-	{
-		Simulation::generateMasses(count, mass,
-											connectionPos + position, velocity);
-	}
-
-
-	virtual void solve()
-	{
-		Mass *m;
-
-		// Apply spring force to each mass
-		for (mMasses.start(); mMasses.forward(); mMasses.next())
-		{
-			m = mMasses.current();
-
-			// Vector from mass to spring connection
-			Vector3d springVector = m->mPos - connectionPos;
-
-			// Apply spring force, spring force formulation
-			m->applyForce(-springVector * springConstant);
-
-			if (collisionDetected(m))
-			{
-				//m->mVelocity = Vector3d(0, 0, 0);
-			}
-		}
-	}
-
-	vec_t springConstant;     /* Stiffness, higher values more spring force */
-
-	Vector3d connectionPos;   /* Location where mass is connected to spring */
-};
-#endif

src/mstl/Vector.cpp

@@ -1,51 +0,0 @@
-#include "Vector.h"
-
-
-int main()
-{
-   Vector<int> numbers;
-   int num[8];
-   int fill = 32;
-   unsigned int i;
-
-
-   num[0] = 14;
-   num[1] = 311;   
-
-   for (i = 2; i < 8; ++i)
-   {
-     num[i] = fill;
-   }
-
-   numbers.pushBack(num[0]);
-   numbers.pushBack(num[1]);
-   numbers.resize(8, fill);
-
-   for (numbers.mIndex = numbers.begin(); numbers.mIndex < numbers.end(); 
-	++numbers.mIndex)
-   {
-     printf("numbers[%i] = %3i   |   numbers[%i] = %3i\n",  
-	    numbers.mIndex, num[numbers.mIndex],
-	    numbers.mIndex, numbers[numbers.mIndex]);
-   }
-
-   printf("\n");
-
-   for (numbers.start(); numbers.forward(); numbers.next())
-   {
-     printf("numbers[%i] = %3i   |   numbers[%i] = %3i\n",  
-	    numbers.mIndex, num[numbers.mIndex],
-	    numbers.mIndex, numbers[numbers.mIndex]);
-   }
-
-   printf("\n");
-
-   for (numbers.finish(); numbers.backward(); numbers.prev())
-   {
-     printf("numbers[%i] = %3i   |   numbers[%i] = %3i\n",  
-	    numbers.mIndex, num[numbers.mIndex],
-	    numbers.mIndex, numbers[numbers.mIndex]);
-   }
-
-   return 0;
-}