games/blockofighter
1
0
Fork 0
Code Releases Activity

Apply clang llvm formatting

Browse source
This commit is contained in:
Michaël Lemaire 2015-06-03 14:29:34 +02:00
parent 9d2084b6b5
commit 371731a73b
54 changed files with 6062 additions and 6171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

629
src/3dutils.cpp
View file

@ -24,337 +24,354 @@ int SKYBOX = -1;
* pyörähdyskappaletta. Muulloin pisteet lasketaan kuutiollisella * pyörähdyskappaletta. Muulloin pisteet lasketaan kuutiollisella
* interpoloinnilla annettujen pisteiden välillä. * interpoloinnilla annettujen pisteiden välillä.
*/ */
void createLathedSurface(point2d *points, point2d *pointderivates, int count, int slices, int stacks){ void createLathedSurface(point2d *points, point2d *pointderivates, int count,
int i, j; int slices, int stacks) {
point2d *h1, *h2; int i, j;
point2d *derivates; point2d *h1, *h2;
if (pointderivates == NULL) derivates = new point2d[count]; point2d *derivates;
else derivates = pointderivates; if (pointderivates == NULL)
//Derivaatta pisteessä i on (points[i+1]-points[i-1])/2 alkua ja loppua lukuunottamatta derivates = new point2d[count];
for (i = 0; i < count; i++){ else
if (pointderivates == NULL || (derivates[i].x == 0 && derivates[i].y == 0)){ derivates = pointderivates;
if (i == 0) h1 = &points[0]; // Derivaatta pisteessä i on (points[i+1]-points[i-1])/2 alkua ja loppua
else h1 = &points[i-1]; // lukuunottamatta
if (i == count-1) h2 = &points[count-1]; for (i = 0; i < count; i++) {
else h2 = &points[i+1]; if (pointderivates == NULL ||
float dx,dy; (derivates[i].x == 0 && derivates[i].y == 0)) {
dx = (h2->x - h1->x); if (i == 0)
dy = (h2->y - h1->y); h1 = &points[0];
if (i > 0 && i < count){ else
dx /= 2; h1 = &points[i - 1];
dy /= 2; if (i == count - 1)
} h2 = &points[count - 1];
derivates[i].x = dx; else
derivates[i].y = dy; h2 = &points[i + 1];
} float dx, dy;
dx = (h2->x - h1->x);
dy = (h2->y - h1->y);
if (i > 0 && i < count) {
dx /= 2;
dy /= 2;
}
derivates[i].x = dx;
derivates[i].y = dy;
} }
}
float sif; float sif;
int si; int si;
point2d newpoint, oldpoint; point2d newpoint, oldpoint;
point2d derivate; point2d derivate;
point2d newnormal, oldnormal; point2d newnormal, oldnormal;
point2d A, B, C, D; point2d A, B, C, D;
oldpoint.x = points[0].x; oldpoint.x = points[0].x;
oldpoint.y = points[0].y; oldpoint.y = points[0].y;
oldnormal.x = derivates[0].y; oldnormal.x = derivates[0].y;
oldnormal.y = -derivates[0].x; oldnormal.y = -derivates[0].x;
point2d *p1, *p2, *d1, *d2; point2d *p1, *p2, *d1, *d2;
int i1, i2; int i1, i2;
float t; float t;
float x1, y1, z1, x2, y2, z2, nx1, ny1, nz1, nx2, ny2, nz2; float x1, y1, z1, x2, y2, z2, nx1, ny1, nz1, nx2, ny2, nz2;
for (i = 1; i <= stacks-(stacks/count); i++){ for (i = 1; i <= stacks - (stacks / count); i++) {
sif = (float)i*count/stacks; sif = (float)i * count / stacks;
si = (int)sif; si = (int)sif;
t = sif-si; t = sif - si;
i1 = si; i1 = si;
i2 = si+1; i2 = si + 1;
if (i2 >= count) i2 = count-1; if (i2 >= count)
p1 = &points[i1]; i2 = count - 1;
p2 = &points[i2]; p1 = &points[i1];
d1 = &derivates[i1]; p2 = &points[i2];
d2 = &derivates[i2]; d1 = &derivates[i1];
//Hermite-käyrä A*t^3 + B*t^2 + C*t + D d2 = &derivates[i2];
//Hermite-käyrän derivaatta 3*A*t^2 + 2*B*t + C // Hermite-käyrä A*t^3 + B*t^2 + C*t + D
//Vakiot A,B,C ja D ovat laskettu siten, että: // Hermite-käyrän derivaatta 3*A*t^2 + 2*B*t + C
//1. H(0)=p1; // Vakiot A,B,C ja D ovat laskettu siten, että:
//2. H(1)=p2; // 1. H(0)=p1;
//3. H'(0)=d1; // 2. H(1)=p2;
//4. H'(1)=d2; // 3. H'(0)=d1;
// // 4. H'(1)=d2;
//A = d2 - 2*p2 + d1 + 2*p1 //
//B = -d2 + 3*p2 - 2*d1 - 3*p1 // A = d2 - 2*p2 + d1 + 2*p1
//C = d1 // B = -d2 + 3*p2 - 2*d1 - 3*p1
//D = p1 // C = d1
A.x = d2->x - 2*p2->x + d1->x + 2*p1->x; // D = p1
A.y = d2->y - 2*p2->y + d1->y + 2*p1->y; A.x = d2->x - 2 * p2->x + d1->x + 2 * p1->x;
B.x = - d2->x + 3*p2->x - 2*d1->x - 3*p1->x; A.y = d2->y - 2 * p2->y + d1->y + 2 * p1->y;
B.y = - d2->y + 3*p2->y - 2*d1->y - 3*p1->y; B.x = -d2->x + 3 * p2->x - 2 * d1->x - 3 * p1->x;
C.x = d1->x; B.y = -d2->y + 3 * p2->y - 2 * d1->y - 3 * p1->y;
C.y = d1->y; C.x = d1->x;
D.x = p1->x; C.y = d1->y;
D.y = p1->y; D.x = p1->x;
D.y = p1->y;
newpoint.x = A.x*t*t*t + B.x*t*t + C.x*t + D.x; newpoint.x = A.x * t * t * t + B.x * t * t + C.x * t + D.x;
newpoint.y = A.y*t*t*t + B.y*t*t + C.y*t + D.y; newpoint.y = A.y * t * t * t + B.y * t * t + C.y * t + D.y;
derivate.x = 3*A.x*t*t + 2*B.x*t + C.x; derivate.x = 3 * A.x * t * t + 2 * B.x * t + C.x;
derivate.y = 3*A.y*t*t + 2*B.y*t + C.y; derivate.y = 3 * A.y * t * t + 2 * B.y * t + C.y;
newnormal.x = derivate.y; newnormal.x = derivate.y;
newnormal.y = -derivate.x; newnormal.y = -derivate.x;
glBegin(GL_QUAD_STRIP); glBegin(GL_QUAD_STRIP);
for (j = 0; j <= slices; j++){ for (j = 0; j <= slices; j++) {
float angle = j*2*PI/slices; float angle = j * 2 * PI / slices;
nx2 = sin(angle)*newnormal.x; nx2 = sin(angle) * newnormal.x;
ny2 = newnormal.y; ny2 = newnormal.y;
nz2 = cos(angle)*newnormal.x; nz2 = cos(angle) * newnormal.x;
glNormal3f(nx2, ny2, nz2); glNormal3f(nx2, ny2, nz2);
x2 = sin(angle)*newpoint.x; x2 = sin(angle) * newpoint.x;
y2 = newpoint.y; y2 = newpoint.y;
z2 = cos(angle)*newpoint.x; z2 = cos(angle) * newpoint.x;
glTexCoord2f(j*1.0/slices,1.0-(i*1.0/(stacks-1))); glTexCoord2f(j * 1.0 / slices, 1.0 - (i * 1.0 / (stacks - 1)));
glVertex3f(x2, y2, z2); glVertex3f(x2, y2, z2);
nx1 = sin(angle)*oldnormal.x; nx1 = sin(angle) * oldnormal.x;
ny1 = oldnormal.y; ny1 = oldnormal.y;
nz1 = cos(angle)*oldnormal.x; nz1 = cos(angle) * oldnormal.x;
glNormal3f(nx1, ny1, nz1); glNormal3f(nx1, ny1, nz1);
x1 = sin(angle)*oldpoint.x; x1 = sin(angle) * oldpoint.x;
y1 = oldpoint.y; y1 = oldpoint.y;
z1 = cos(angle)*oldpoint.x; z1 = cos(angle) * oldpoint.x;
glTexCoord2f(j*1.0/slices,1.0-((i-1)*1.0/(stacks-1))); glTexCoord2f(j * 1.0 / slices, 1.0 - ((i - 1) * 1.0 / (stacks - 1)));
glVertex3f(x1, y1, z1); glVertex3f(x1, y1, z1);
}
glEnd();
oldpoint.x = newpoint.x;
oldpoint.y = newpoint.y;
oldnormal.x = newnormal.x;
oldnormal.y = newnormal.y;
} }
glEnd();
oldpoint.x = newpoint.x;
oldpoint.y = newpoint.y;
oldnormal.x = newnormal.x;
oldnormal.y = newnormal.y;
}
} }
GLUquadricObj *spherequadric = gluNewQuadric(); GLUquadricObj *spherequadric = gluNewQuadric();
void createSphere(float r, int slices, int stacks){ void createSphere(float r, int slices, int stacks) {
/*float phi, theta; /*float phi, theta;
int x, y; int x, y;
for (y = 0; y < stacks; y++){ for (y = 0; y < stacks; y++){
for (x = 0; x < slices; x++){ for (x = 0; x < slices; x++){
} }
}*/ }*/
gluSphere(spherequadric, r, slices, stacks); gluSphere(spherequadric, r, slices, stacks);
} }
#define DEFAULTSLICES 20 #define DEFAULTSLICES 20
#define DEFAULTSTACKS 10 #define DEFAULTSTACKS 10
void createSphere(float r){ void createSphere(float r) { createSphere(r, DEFAULTSLICES, DEFAULTSTACKS); }
createSphere(r, DEFAULTSLICES, DEFAULTSTACKS);
bool solvePointInTriangle(float *position, float *normal, Vertex *v1,
Vertex *v2, Vertex *v3, float *t, float *u,
float *v) {
float edge1[3], edge2[3], tvec[3], pvec[3], qvec[3];
float det, inv_det;
// find vectors for two edges sharing vert0
vectorSub(edge1, v2->position, v1->position);
vectorSub(edge2, v3->position, v1->position);
// begin calculating determinant - also used to calculate U parameter
vectorCross(pvec, normal, edge2);
// if determinant is near zero, ray lies in plane of triangle
det = vectorDot(edge1, pvec);
if (det > -EPSILON && det < EPSILON)
return false;
inv_det = 1.0 / det;
// calculate distance from vert0 to ray origin
vectorSub(tvec, position, v1->position);
// calculate U parameter and test bounds
*u = vectorDot(tvec, pvec) * inv_det;
if (*u < 0.0 || *u > 1.0)
return false;
// prepare to test V parameter
vectorCross(qvec, tvec, edge1);
// calculate V parameter and test bounds
*v = vectorDot(normal, qvec) * inv_det;
if (*v < 0.0 || *u + *v > 1.0)
return false;
// calculate t, ray intersects triangle
*t = vectorDot(edge2, qvec) * inv_det;
return true;
} }
bool solvePointInTriangle(float *position, float *normal, float distanceFromPlane(float point[3], float normal[3], float distance) {
Vertex *v1, Vertex *v2, Vertex *v3, return vectorDot(point, normal) + distance;
float *t, float *u, float *v){
float edge1[3], edge2[3], tvec[3], pvec[3], qvec[3];
float det,inv_det;
// find vectors for two edges sharing vert0
vectorSub(edge1, v2->position, v1->position);
vectorSub(edge2, v3->position, v1->position);
// begin calculating determinant - also used to calculate U parameter
vectorCross(pvec, normal, edge2);
//if determinant is near zero, ray lies in plane of triangle
det = vectorDot(edge1, pvec);
if (det > -EPSILON && det < EPSILON) return false;
inv_det = 1.0 / det;
// calculate distance from vert0 to ray origin
vectorSub(tvec, position, v1->position);
// calculate U parameter and test bounds
*u = vectorDot(tvec, pvec) * inv_det;
if (*u < 0.0 || *u > 1.0) return false;
// prepare to test V parameter
vectorCross(qvec, tvec, edge1);
// calculate V parameter and test bounds
*v = vectorDot(normal, qvec) * inv_det;
if (*v < 0.0 || *u + *v > 1.0) return false;
// calculate t, ray intersects triangle
*t = vectorDot(edge2, qvec) * inv_det;
return true;
} }
void createSkyBox(float x, float y, float z, float w, float h, float l) {
glEnable(GL_TEXTURE_2D);
glClear(GL_DEPTH_BUFFER_BIT);
glDisable(GL_DEPTH_TEST);
glDisable(GL_BLEND);
glDisable(GL_CULL_FACE);
glDisable(GL_ALPHA_TEST);
glDisable(GL_LIGHTING);
glShadeModel(GL_FLAT);
float distanceFromPlane(float point[3], float normal[3], float distance){ float modelview[16];
return vectorDot(point, normal) + distance;
glGetFloatv(GL_MODELVIEW_MATRIX, modelview);
modelview[12] = modelview[13] = modelview[14] = 0.0f;
glPushMatrix();
glLoadMatrixf(modelview);
if (SKYBOX > 0) {
glCallList(SKYBOX);
} else {
SKYBOX = glGenLists(1);
float d = 1.0 / 512;
// glPushAttrib(GL_COLOR);
glNewList(SKYBOX, GL_COMPILE_AND_EXECUTE);
// glBindTexture(GL_TEXTURE_2D, SKY_BACK_ID);
skybacktexture->enable();
glBegin(GL_QUADS);
glColor4f(1, 1, 1, 1.0);
glTexCoord2f(1 - d, 1 - d);
glVertex3f(x + w, y, z);
glTexCoord2f(1 - d, 0 + d);
glVertex3f(x + w, y + h, z);
glTexCoord2f(0 + d, 0 + d);
glVertex3f(x, y + h, z);
glTexCoord2f(0 + d, 1 - d);
glVertex3f(x, y, z);
glEnd();
// glBindTexture(GL_TEXTURE_2D, SKY_FRONT_ID);
skyfronttexture->enable();
glBegin(GL_QUADS);
glColor4f(1, 1, 1, 1.0);
glTexCoord2f(1 - d, 1 - d);
glVertex3f(x, y, z + l);
glTexCoord2f(1 - d, 0 + d);
glVertex3f(x, y + h, z + l);
glTexCoord2f(0 + d, 0 + d);
glVertex3f(x + w, y + h, z + l);
glTexCoord2f(0 + d, 1 - d);
glVertex3f(x + w, y, z + l);
glEnd();
// glBindTexture(GL_TEXTURE_2D, SKY_TOP_ID);
skytoptexture->enable();
glBegin(GL_QUADS);
glColor4f(1, 1, 1, 1.0);
glTexCoord2f(0 + d, 0 + d);
glVertex3f(x + w, y + h, z + l);
glTexCoord2f(1 - d, 0 + d);
glVertex3f(x + w, y + h, z);
glTexCoord2f(1 - d, 1 - d);
glVertex3f(x, y + h, z);
glTexCoord2f(0 + d, 1 - d);
glVertex3f(x, y + h, z + l);
/*glTexCoord2f(1.0f, 0+d); glVertex3f(x + w, y + h, z);
glTexCoord2f(1.0f, 1.0f); glVertex3f(x + w, y + h, z + l);
glTexCoord2f(0+d, 1.0f); glVertex3f(x, y + h, z + l);
glTexCoord2f(0+d, 0+d); glVertex3f(x, y + h, z);*/
glEnd();
// glBindTexture(GL_TEXTURE_2D, SKY_BOTTOM_ID);
skybottomtexture->enable();
glBegin(GL_QUADS);
glColor4f(1, 1, 1, 1.0);
glTexCoord2f(1 - d, 0 + d);
glVertex3f(x, y, z);
glTexCoord2f(1 - d, 1 - d);
glVertex3f(x + w, y, z);
glTexCoord2f(0 + d, 1 - d);
glVertex3f(x + w, y, z + l);
glTexCoord2f(0 + d, 0 + d);
glVertex3f(x, y, z + l);
glEnd();
// glBindTexture(GL_TEXTURE_2D, SKY_LEFT_ID);
skylefttexture->enable();
glBegin(GL_QUADS);
glColor4f(1, 1, 1, 1.0);
glTexCoord2f(1 - d, 0 + d);
glVertex3f(x, y + h, z);
glTexCoord2f(0 + d, 0 + d);
glVertex3f(x, y + h, z + l);
glTexCoord2f(0 + d, 1 - d);
glVertex3f(x, y, z + l);
glTexCoord2f(1 - d, 1 - d);
glVertex3f(x, y, z);
glEnd();
// glBindTexture(GL_TEXTURE_2D, SKY_RIGHT_ID);
skyrighttexture->enable();
glBegin(GL_QUADS);
glColor4f(1, 1, 1, 1.0);
glTexCoord2f(0 + d, 1 - d);
glVertex3f(x + w, y, z);
glTexCoord2f(1 - d, 1 - d);
glVertex3f(x + w, y, z + l);
glTexCoord2f(1 - d, 0 + d);
glVertex3f(x + w, y + h, z + l);
glTexCoord2f(0 + d, 0 + d);
glVertex3f(x + w, y + h, z);
glEnd();
glEndList();
}
glPopMatrix();
glEnable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE);
glDisable(GL_TEXTURE_2D);
glEnable(GL_LIGHTING);
glShadeModel(GL_SMOOTH);
} }
void enable2D(void) {
void createSkyBox(float x, float y, float z, float w, float h, float l) glDisable(GL_LIGHTING);
{ glDisable(GL_CULL_FACE);
glEnable(GL_TEXTURE_2D); glDisable(GL_DEPTH_TEST);
glClear(GL_DEPTH_BUFFER_BIT); glMatrixMode(GL_PROJECTION);
glDisable(GL_DEPTH_TEST); glPushMatrix();
glDisable(GL_BLEND); glLoadIdentity();
glDisable(GL_CULL_FACE); gluOrtho2D(0, 1, 1, 0);
glDisable(GL_ALPHA_TEST); glMatrixMode(GL_MODELVIEW);
glDisable(GL_LIGHTING); glPushMatrix();
glShadeModel(GL_FLAT); glLoadIdentity();
float modelview[16];
glGetFloatv(GL_MODELVIEW_MATRIX, modelview);
modelview[12] = modelview[13] = modelview[14] = 0.0f;
glPushMatrix();
glLoadMatrixf(modelview);
if (SKYBOX > 0){
glCallList(SKYBOX);
}
else{
SKYBOX = glGenLists(1);
float d = 1.0/512;
//glPushAttrib(GL_COLOR);
glNewList(SKYBOX, GL_COMPILE_AND_EXECUTE);
//glBindTexture(GL_TEXTURE_2D, SKY_BACK_ID);
skybacktexture->enable();
glBegin(GL_QUADS);
glColor4f(1, 1, 1, 1.0);
glTexCoord2f(1-d, 1-d); glVertex3f(x + w, y, z);
glTexCoord2f(1-d, 0+d); glVertex3f(x + w, y + h, z);
glTexCoord2f(0+d, 0+d); glVertex3f(x, y + h, z);
glTexCoord2f(0+d, 1-d); glVertex3f(x, y, z);
glEnd();
//glBindTexture(GL_TEXTURE_2D, SKY_FRONT_ID);
skyfronttexture->enable();
glBegin(GL_QUADS);
glColor4f(1, 1, 1, 1.0);
glTexCoord2f(1-d, 1-d); glVertex3f(x, y, z + l);
glTexCoord2f(1-d, 0+d); glVertex3f(x, y + h, z + l);
glTexCoord2f(0+d, 0+d); glVertex3f(x + w, y + h, z + l);
glTexCoord2f(0+d, 1-d); glVertex3f(x + w, y, z + l);
glEnd();
//glBindTexture(GL_TEXTURE_2D, SKY_TOP_ID);
skytoptexture->enable();
glBegin(GL_QUADS);
glColor4f(1, 1, 1, 1.0);
glTexCoord2f(0+d, 0+d); glVertex3f(x + w, y + h, z + l);
glTexCoord2f(1-d, 0+d); glVertex3f(x + w, y + h, z);
glTexCoord2f(1-d, 1-d); glVertex3f(x, y + h, z);
glTexCoord2f(0+d, 1-d); glVertex3f(x, y + h, z + l);
/*glTexCoord2f(1.0f, 0+d); glVertex3f(x + w, y + h, z);
glTexCoord2f(1.0f, 1.0f); glVertex3f(x + w, y + h, z + l);
glTexCoord2f(0+d, 1.0f); glVertex3f(x, y + h, z + l);
glTexCoord2f(0+d, 0+d); glVertex3f(x, y + h, z);*/
glEnd();
//glBindTexture(GL_TEXTURE_2D, SKY_BOTTOM_ID);
skybottomtexture->enable();
glBegin(GL_QUADS);
glColor4f(1, 1, 1, 1.0);
glTexCoord2f(1-d, 0+d); glVertex3f(x, y, z);
glTexCoord2f(1-d, 1-d); glVertex3f(x + w, y, z);
glTexCoord2f(0+d, 1-d); glVertex3f(x + w, y, z + l);
glTexCoord2f(0+d, 0+d); glVertex3f(x, y, z + l);
glEnd();
//glBindTexture(GL_TEXTURE_2D, SKY_LEFT_ID);
skylefttexture->enable();
glBegin(GL_QUADS);
glColor4f(1, 1, 1, 1.0);
glTexCoord2f(1-d, 0+d); glVertex3f(x, y + h, z);
glTexCoord2f(0+d, 0+d); glVertex3f(x, y + h, z + l);
glTexCoord2f(0+d, 1-d); glVertex3f(x, y, z + l);
glTexCoord2f(1-d, 1-d); glVertex3f(x, y, z);
glEnd();
//glBindTexture(GL_TEXTURE_2D, SKY_RIGHT_ID);
skyrighttexture->enable();
glBegin(GL_QUADS);
glColor4f(1, 1, 1, 1.0);
glTexCoord2f(0+d, 1-d); glVertex3f(x + w, y, z);
glTexCoord2f(1-d, 1-d); glVertex3f(x + w, y, z + l);
glTexCoord2f(1-d, 0+d); glVertex3f(x + w, y + h, z + l);
glTexCoord2f(0+d, 0+d); glVertex3f(x + w, y + h, z);
glEnd();
glEndList();
}
glPopMatrix();
glEnable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE);
glDisable(GL_TEXTURE_2D);
glEnable(GL_LIGHTING);
glShadeModel(GL_SMOOTH);
} }
void enable2D(void){ void disable2D(void) {
glDisable(GL_LIGHTING); glPopMatrix();
glDisable(GL_CULL_FACE); glMatrixMode(GL_PROJECTION);
glDisable(GL_DEPTH_TEST); glPopMatrix();
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_MODELVIEW);
glPushMatrix(); glEnable(GL_DEPTH_TEST);
glLoadIdentity(); glEnable(GL_CULL_FACE);
gluOrtho2D(0, 1, 1, 0); glEnable(GL_LIGHTING);
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();
}
void disable2D(void){
glPopMatrix();
glMatrixMode(GL_PROJECTION);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glEnable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE);
glEnable(GL_LIGHTING);
} }

40
src/3dutils.h
View file

@ -4,31 +4,24 @@
#include "main.h" #include "main.h"
#include "texture.h" #include "texture.h"
#define SKYFRONT DATAPATH "tback.png"
#define SKYBACK DATAPATH "tfront.png"
#define SKYLEFT DATAPATH "tleft.png"
#define SKYRIGHT DATAPATH "tright.png"
#define SKYTOP DATAPATH "ttop.png"
#define SKYBOTTOM DATAPATH "tbottom.png"
#define DAMAGEHEAD DATAPATH "damagehead.png"
#define SKYFRONT DATAPATH"tback.png" #define DAMAGETORSO DATAPATH "damagetorso.png"
#define SKYBACK DATAPATH"tfront.png" #define DAMAGEHAND DATAPATH "damagehand.png"
#define SKYLEFT DATAPATH"tleft.png" #define DAMAGELEG DATAPATH "damageleg.png"
#define SKYRIGHT DATAPATH"tright.png" #define FACE DATAPATH "perusnaama3.png"
#define SKYTOP DATAPATH"ttop.png"
#define SKYBOTTOM DATAPATH"tbottom.png"
#define DAMAGEHEAD DATAPATH"damagehead.png"
#define DAMAGETORSO DATAPATH"damagetorso.png"
#define DAMAGEHAND DATAPATH"damagehand.png"
#define DAMAGELEG DATAPATH"damageleg.png"
#define FACE DATAPATH"perusnaama3.png"
extern int SKYBOX; extern int SKYBOX;
typedef struct{ typedef struct { float x, y; } point2d;
float x,y;
} point2d;
typedef struct{ typedef struct { float x, y, z; } point3d;
float x,y,z;
} point3d;
extern Texture *flaretexture; extern Texture *flaretexture;
extern Texture *skyfronttexture; extern Texture *skyfronttexture;
@ -40,7 +33,8 @@ extern Texture *skybottomtexture;
extern Texture *damageHead; extern Texture *damageHead;
extern Texture *faceTexture; extern Texture *faceTexture;
void createLathedSurface(point2d *points, point2d *pointderivates, int count, int slices, int stacks); void createLathedSurface(point2d *points, point2d *pointderivates, int count,
int slices, int stacks);
void createSphere(float r, int slices, int stacks); void createSphere(float r, int slices, int stacks);
void createSphere(float r); void createSphere(float r);
@ -48,10 +42,8 @@ float distanceFromPlane(float point[3], float normal[3], float distance);
void createSkyBox(float x, float y, float z, float w, float h, float l); void createSkyBox(float x, float y, float z, float w, float h, float l);
// MUST be called in pairs, enable pushes and disable pops
//MUST be called in pairs, enable pushes and disable pops
void enable2D(void); void enable2D(void);
void disable2D(void); void disable2D(void);
#endif #endif

66
src/appearance.cpp
View file

@ -1,24 +1,20 @@
#include "main.h" #include "main.h"
#include "appearance.h" #include "appearance.h"
#include "utils.h" #include "utils.h"
#include "3dutils.h" #include "3dutils.h"
#include "glapi.h" #include "glapi.h"
Appearance::Appearance(void){ Appearance::Appearance(void) {}
}
void Appearance::prepare(void){
}
void Appearance::prepare(void) {}
/*BoxAppearance::BoxAppearance(void){ /*BoxAppearance::BoxAppearance(void){
setDimension(-1, 1, -1, 1, -1, 1); setDimension(-1, 1, -1, 1, -1, 1);
} }
BoxAppearance::setDimension(float x1, float x2, float y1, float y2, float z1, float z2){ BoxAppearance::setDimension(float x1, float x2, float y1, float y2, float z1,
float z2){
if (x1 > x2) swapFloat(&x1, &x2); if (x1 > x2) swapFloat(&x1, &x2);
if (y1 > y2) swapFloat(&y1, &y2); if (y1 > y2) swapFloat(&y1, &y2);
if (z1 > z2) swapFloat(&z1, &z2); if (z1 > z2) swapFloat(&z1, &z2);
@ -77,41 +73,31 @@ void BoxAppearance::draw(void){
this->material.disable(); this->material.disable();
}*/ }*/
Material *Appearance::getMaterial(void) { return &this->material; }
Material* Appearance::getMaterial(void){ void Appearance::setMaterial(Material matsku) { material = matsku; }
return &this->material;
MultiAppearance::MultiAppearance(void) { appearances = NULL; }
void MultiAppearance::addAppearance(Appearance *appearance) {
appearancelist *node = new appearancelist;
node->data = appearance;
node->next = appearances;
appearances = node;
} }
void Appearance::setMaterial(Material matsku){ void MultiAppearance::prepare(void) {
material = matsku; appearancelist *node = appearances;
while (node != NULL) {
node->data->prepare();
node = node->next;
}
} }
void MultiAppearance::draw(void) {
appearancelist *node = appearances;
while (node != NULL) {
MultiAppearance::MultiAppearance(void){ node->data->draw();
appearances = NULL; node = node->next;
} }
void MultiAppearance::addAppearance(Appearance *appearance){
appearancelist *node = new appearancelist;
node->data = appearance;
node->next = appearances;
appearances = node;
}
void MultiAppearance::prepare(void){
appearancelist *node = appearances;
while (node != NULL){
node->data->prepare();
node = node->next;
}
}
void MultiAppearance::draw(void){
appearancelist *node = appearances;
while (node != NULL){
node->data->draw();
node = node->next;
}
} }

28
src/appearance.h
View file

@ -8,37 +8,35 @@
/* /*
* Abstract class for drawing objects * Abstract class for drawing objects
*/ */
class Appearance{ class Appearance {
private: private:
public: public:
Material material; Material material;
Appearance(void); Appearance(void);
Material* getMaterial(void); Material *getMaterial(void);
void setMaterial(Material mat); void setMaterial(Material mat);
virtual void prepare(void); virtual void prepare(void);
virtual void draw(void) = 0; virtual void draw(void) = 0;
}; };
struct appearancelist {
struct appearancelist{ Appearance *data;
Appearance *data; appearancelist *next;
appearancelist *next;
}; };
class MultiAppearance : public Appearance{ class MultiAppearance : public Appearance {
private: private:
appearancelist *appearances; appearancelist *appearances;
public: public:
MultiAppearance(void); MultiAppearance(void);
void addAppearance(Appearance *appearance); void addAppearance(Appearance *appearance);
void prepare(void); void prepare(void);
void draw(void); void draw(void);
}; };
#endif #endif

451
src/audio.cpp
View file

@ -5,266 +5,265 @@
#include "audio.h" #include "audio.h"
#define SOUND_FADENONE 0 #define SOUND_FADENONE 0
#define SOUND_FADEIN 1 #define SOUND_FADEIN 1
#define SOUND_FADEOUT 2 #define SOUND_FADEOUT 2
struct soundlist {
struct soundlist{ Sound *sound;
Sound *sound; soundlist *next;
soundlist *next;
}; };
soundlist *allsounds = NULL; soundlist *allsounds = NULL;
Sound::Sound(Sound *source) {
Sound::Sound(Sound *source){ memcpy(this, source, sizeof(Sound));
memcpy(this, source, sizeof(Sound)); soundlist *node = new soundlist;
soundlist *node = new soundlist; node->sound = this;
node->sound = this; node->next = allsounds;
node->next = allsounds; allsounds = node;
allsounds = node;
} }
Sound::Sound(char *filename){ Sound::Sound(char *filename) {
load(filename, SOUNDTYPE_AUTODETECT, false); load(filename, SOUNDTYPE_AUTODETECT, false);
//printf("%s: %p, %p, %p, %p\n", filename, this, stream, sample, module); // printf("%s: %p, %p, %p, %p\n", filename, this, stream, sample, module);
} }
Sound::Sound(char *filename, int type){ Sound::Sound(char *filename, int type) { load(filename, type, false); }
load(filename, type, false);
Sound::Sound(char *filename, bool loops) {
load(filename, SOUNDTYPE_AUTODETECT, loops);
// printf("%s: %p, %p, %p, %p\n", filename, this, stream, sample, module);
} }
Sound::Sound(char *filename, bool loops){ Sound::Sound(char *filename, int type, bool loops) {
load(filename, SOUNDTYPE_AUTODETECT, loops); load(filename, type, loops);
//printf("%s: %p, %p, %p, %p\n", filename, this, stream, sample, module);
} }
Sound::Sound(char *filename, int type, bool loops){ bool endsWith(char *str1, char *str2) {
load(filename, type, loops); char *str3 = str1 + strlen(str1) - strlen(str2);
}
bool endsWith(char *str1, char *str2){
char *str3 = str1 + strlen(str1) - strlen(str2);
#ifdef WIN32 #ifdef WIN32
if (stricmp(str3, str2)) return false; if (stricmp(str3, str2))
#else
if (strcasecmp(str3, str2)) return false;
#endif
else return true;
}
void Sound::load(char *filename, int type, bool loops){
this->filename = filename;
if (type == SOUNDTYPE_AUTODETECT){
if (endsWith(filename, "mp3") ||
endsWith(filename, "mp2") ||
endsWith(filename, "ogg")) type = SOUNDTYPE_STREAM;
if (endsWith(filename, "wav") ||
endsWith(filename, "raw")) type = SOUNDTYPE_SAMPLE;
if (endsWith(filename, "s3m") ||
endsWith(filename, "xm") ||
endsWith(filename, "it") ||
endsWith(filename, "mid") ||
endsWith(filename, "rmi") ||
endsWith(filename, "sgr") ||
endsWith(filename, "mod")) type = SOUNDTYPE_MODULE;
}
#ifdef AUDIO_FMOD
sample = NULL;
module = NULL;
stream = NULL;
this->type = type;
if (type == SOUNDTYPE_MODULE){
module = FMUSIC_LoadSong(filename);
this->loops = false;
} else if (type == SOUNDTYPE_SAMPLE){
if (loops){
sample = FSOUND_Sample_Load(FSOUND_FREE, filename, FSOUND_LOOP_NORMAL, 0);
FSOUND_Sample_SetLoopMode(sample, FSOUND_LOOP_NORMAL);
} else{
sample = FSOUND_Sample_Load(FSOUND_FREE, filename, FSOUND_LOOP_OFF, 0);
FSOUND_Sample_SetLoopMode(sample, FSOUND_LOOP_OFF);
}
this->loops = loops;
} else if (type == SOUNDTYPE_STREAM){
if (loops){
stream = FSOUND_Stream_OpenFile(filename, FSOUND_LOOP_NORMAL, 0);
} else{
stream = FSOUND_Stream_OpenFile(filename, FSOUND_LOOP_OFF, 0);
}
this->loops = loops;
}
#endif
stopcallback = NULL;
soundlist *node = new soundlist;
node->sound = this;
node->next = allsounds;
allsounds = node;
minduration = 0;
setVolume(1.0);
}
bool Sound::play(){
//printf("Playing %s: %p, %p, %p, %p\n", filename, this, stream, sample, module);
if (minduration > 0) return false;
running = true;
finished = false;
fademode = SOUND_FADENONE;
minduration = 0;
#ifdef AUDIO_FMOD
if (type == SOUNDTYPE_MODULE){
FMUSIC_PlaySong(module);
FMUSIC_SetMasterVolume(module, volume*256);
} else if (type == SOUNDTYPE_SAMPLE){
channel = FSOUND_PlaySound(FSOUND_FREE, sample);
FSOUND_SetVolume(channel, volume*256);
if (!loops){
running = false;
finished = false;
}
} else if (type == SOUNDTYPE_STREAM){
channel = FSOUND_Stream_Play(FSOUND_FREE, stream);
FSOUND_SetVolume(channel, volume*256);
}
#endif
//printf("Done: %f\n", volume);
return true;
}
void Sound::play(int minduration){
if (play()) this->minduration = minduration;
}
void Sound::stop(){
#ifdef AUDIO_FMOD
if (type == SOUNDTYPE_MODULE){
FMUSIC_StopSong(module);
} else if (type == SOUNDTYPE_SAMPLE){
FSOUND_StopSound(channel);
} else if (type == SOUNDTYPE_STREAM){
FSOUND_Stream_Stop(stream);
}
#endif
}
void Sound::setVolume(float volume){
//printf("Volume %s: %f\n", filename, volume);
#ifdef AUDIO_FMOD
if (type == SOUNDTYPE_MODULE){
FMUSIC_SetMasterVolume(module, volume*256);
} else if (type == SOUNDTYPE_SAMPLE){
FSOUND_SetVolume(channel, volume*256);
} else if (type == SOUNDTYPE_STREAM){
FSOUND_SetVolume(channel, volume*256);
}
#endif
this->volume = volume;
}
#ifdef AUDIO_FMOD
signed char streamendcallback(FSOUND_STREAM *stream, void *buff, int len, int param){
Sound *sound = (Sound *)param;
sound->setFinished();
return true;
}
#endif
void Sound::setStopCallback(STOPCALLBACK callback){
stopcallback = callback;
#ifdef AUDIO_FMOD
if (type == SOUNDTYPE_MODULE){
} else if (type == SOUNDTYPE_SAMPLE){
//NOT SUPPORTED
} else if (type == SOUNDTYPE_STREAM){
FSOUND_Stream_SetEndCallback(stream, streamendcallback, (int)this);
}
#endif
}
void Sound::setFinished(void){
finished = true;
}
bool Sound::isFinished(void){
#ifdef AUDIO_FMOD
if (type == SOUNDTYPE_MODULE){
if (FMUSIC_IsFinished(module)) return true;
} else if (type == SOUNDTYPE_SAMPLE){
//NOT SUPPORTED
} else if (type == SOUNDTYPE_STREAM){
if (finished) return true;
}
#endif
return false; return false;
#else
if (strcasecmp(str3, str2))
return false;
#endif
else
return true;
} }
void Sound::update(void){ void Sound::load(char *filename, int type, bool loops) {
if (running){ this->filename = filename;
if (isFinished()){ if (type == SOUNDTYPE_AUTODETECT) {
running = false; if (endsWith(filename, "mp3") || endsWith(filename, "mp2") ||
if (stopcallback != NULL) stopcallback(this); endsWith(filename, "ogg"))
} else{ type = SOUNDTYPE_STREAM;
if (fademode == SOUND_FADEIN){
if (fadepos < fadetarget){ if (endsWith(filename, "wav") || endsWith(filename, "raw"))
fadepos++; type = SOUNDTYPE_SAMPLE;
setVolume((float)fadepos/fadetarget);
} else fademode = SOUND_FADENONE; if (endsWith(filename, "s3m") || endsWith(filename, "xm") ||
} endsWith(filename, "it") || endsWith(filename, "mid") ||
if (fademode == SOUND_FADEOUT){ endsWith(filename, "rmi") || endsWith(filename, "sgr") ||
if (fadepos < fadetarget){ endsWith(filename, "mod"))
fadepos++; type = SOUNDTYPE_MODULE;
setVolume(1.0 - (float)fadepos/fadetarget); }
} else{ #ifdef AUDIO_FMOD
fademode = SOUND_FADENONE; sample = NULL;
stop(); module = NULL;
} stream = NULL;
} this->type = type;
if (type == SOUNDTYPE_MODULE) {
module = FMUSIC_LoadSong(filename);
this->loops = false;
} else if (type == SOUNDTYPE_SAMPLE) {
if (loops) {
sample = FSOUND_Sample_Load(FSOUND_FREE, filename, FSOUND_LOOP_NORMAL, 0);
FSOUND_Sample_SetLoopMode(sample, FSOUND_LOOP_NORMAL);
} else {
sample = FSOUND_Sample_Load(FSOUND_FREE, filename, FSOUND_LOOP_OFF, 0);
FSOUND_Sample_SetLoopMode(sample, FSOUND_LOOP_OFF);
}
this->loops = loops;
} else if (type == SOUNDTYPE_STREAM) {
if (loops) {
stream = FSOUND_Stream_OpenFile(filename, FSOUND_LOOP_NORMAL, 0);
} else {
stream = FSOUND_Stream_OpenFile(filename, FSOUND_LOOP_OFF, 0);
}
this->loops = loops;
}
#endif
stopcallback = NULL;
soundlist *node = new soundlist;
node->sound = this;
node->next = allsounds;
allsounds = node;
minduration = 0;
setVolume(1.0);
}
bool Sound::play() {
// printf("Playing %s: %p, %p, %p, %p\n", filename, this, stream, sample,
// module);
if (minduration > 0)
return false;
running = true;
finished = false;
fademode = SOUND_FADENONE;
minduration = 0;
#ifdef AUDIO_FMOD
if (type == SOUNDTYPE_MODULE) {
FMUSIC_PlaySong(module);
FMUSIC_SetMasterVolume(module, volume * 256);
} else if (type == SOUNDTYPE_SAMPLE) {
channel = FSOUND_PlaySound(FSOUND_FREE, sample);
FSOUND_SetVolume(channel, volume * 256);
if (!loops) {
running = false;
finished = false;
}
} else if (type == SOUNDTYPE_STREAM) {
channel = FSOUND_Stream_Play(FSOUND_FREE, stream);
FSOUND_SetVolume(channel, volume * 256);
}
#endif
// printf("Done: %f\n", volume);
return true;
}
void Sound::play(int minduration) {
if (play())
this->minduration = minduration;
}
void Sound::stop() {
#ifdef AUDIO_FMOD
if (type == SOUNDTYPE_MODULE) {
FMUSIC_StopSong(module);
} else if (type == SOUNDTYPE_SAMPLE) {
FSOUND_StopSound(channel);
} else if (type == SOUNDTYPE_STREAM) {
FSOUND_Stream_Stop(stream);
}
#endif
}
void Sound::setVolume(float volume) {
// printf("Volume %s: %f\n", filename, volume);
#ifdef AUDIO_FMOD
if (type == SOUNDTYPE_MODULE) {
FMUSIC_SetMasterVolume(module, volume * 256);
} else if (type == SOUNDTYPE_SAMPLE) {
FSOUND_SetVolume(channel, volume * 256);
} else if (type == SOUNDTYPE_STREAM) {
FSOUND_SetVolume(channel, volume * 256);
}
#endif
this->volume = volume;
}
#ifdef AUDIO_FMOD
signed char streamendcallback(FSOUND_STREAM *stream, void *buff, int len,
int param) {
Sound *sound = (Sound *)param;
sound->setFinished();
return true;
}
#endif
void Sound::setStopCallback(STOPCALLBACK callback) {
stopcallback = callback;
#ifdef AUDIO_FMOD
if (type == SOUNDTYPE_MODULE) {
} else if (type == SOUNDTYPE_SAMPLE) {
// NOT SUPPORTED
} else if (type == SOUNDTYPE_STREAM) {
FSOUND_Stream_SetEndCallback(stream, streamendcallback, (int)this);
}
#endif
}
void Sound::setFinished(void) { finished = true; }
bool Sound::isFinished(void) {
#ifdef AUDIO_FMOD
if (type == SOUNDTYPE_MODULE) {
if (FMUSIC_IsFinished(module))
return true;
} else if (type == SOUNDTYPE_SAMPLE) {
// NOT SUPPORTED
} else if (type == SOUNDTYPE_STREAM) {
if (finished)
return true;
}
#endif
return false;
}
void Sound::update(void) {
if (running) {
if (isFinished()) {
running = false;
if (stopcallback != NULL)
stopcallback(this);
} else {
if (fademode == SOUND_FADEIN) {
if (fadepos < fadetarget) {
fadepos++;
setVolume((float)fadepos / fadetarget);
} else
fademode = SOUND_FADENONE;
}
if (fademode == SOUND_FADEOUT) {
if (fadepos < fadetarget) {
fadepos++;
setVolume(1.0 - (float)fadepos / fadetarget);
} else {
fademode = SOUND_FADENONE;
stop();
} }
}
} }
if (minduration > 0) minduration--; }
if (minduration > 0)
minduration--;
} }
void Sound::fadeIn(int length){ void Sound::fadeIn(int length) {
fademode = SOUND_FADEIN; fademode = SOUND_FADEIN;
fadepos = 0; fadepos = 0;
fadetarget = length; fadetarget = length;
} }
void Sound::fadeOut(int length){ void Sound::fadeOut(int length) {
if (fademode == SOUND_FADEIN){ if (fademode == SOUND_FADEIN) {
float percent = 1.0 - (float)fadepos/fadetarget; float percent = 1.0 - (float)fadepos / fadetarget;
fadepos = fadetarget * percent; fadepos = fadetarget * percent;
} }
fadepos = 0; fadepos = 0;
fadetarget = length; fadetarget = length;
fademode = SOUND_FADEOUT; fademode = SOUND_FADEOUT;
} }
void initAudio(void) {
void initAudio(void){
#ifdef AUDIO_FMOD #ifdef AUDIO_FMOD
FSOUND_Init(44100, 32, 0); FSOUND_Init(44100, 32, 0);
#endif #endif
} }
void uninitAudio(void){ void uninitAudio(void) {
#ifdef AUDIO_FMOD #ifdef AUDIO_FMOD
FSOUND_Close(); FSOUND_Close();
#endif #endif
} }
void updateAudio(void){ void updateAudio(void) {
soundlist *node = allsounds; soundlist *node = allsounds;
while (node != NULL){ while (node != NULL) {
Sound *sound = node->sound; Sound *sound = node->sound;
sound->update(); sound->update();
node = node->next; node = node->next;
} }
} }

75
src/audio.h
View file

@ -1,67 +1,65 @@
#ifndef __AUDIO_H_INCLUDED__ #ifndef __AUDIO_H_INCLUDED__
#define __AUDIO_H_INCLUDED__ #define __AUDIO_H_INCLUDED__
#ifdef AUDIO_FMOD #ifdef AUDIO_FMOD
#include <fmod.h> #include <fmod.h>
#endif #endif
class Sound; class Sound;
typedef void(* STOPCALLBACK)(Sound *sound); typedef void (*STOPCALLBACK)(Sound *sound);
#define SOUNDTYPE_AUTODETECT 0 #define SOUNDTYPE_AUTODETECT 0
#define SOUNDTYPE_MODULE 1 #define SOUNDTYPE_MODULE 1
#define SOUNDTYPE_STREAM 2 #define SOUNDTYPE_STREAM 2
#define SOUNDTYPE_SAMPLE 3 #define SOUNDTYPE_SAMPLE 3
#define BGSONG DATAPATH"boom.mp3" #define BGSONG DATAPATH "boom.mp3"
class Sound{ class Sound {
private: private:
#ifdef AUDIO_FMOD #ifdef AUDIO_FMOD
int type; int type;
FMUSIC_MODULE *module; FMUSIC_MODULE *module;
FSOUND_STREAM *stream; FSOUND_STREAM *stream;
FSOUND_SAMPLE *sample; FSOUND_SAMPLE *sample;
int channel; int channel;
#endif #endif
bool loops; bool loops;
bool finished; bool finished;
bool running; bool running;
float volume; float volume;
STOPCALLBACK stopcallback; STOPCALLBACK stopcallback;
bool isFinished(void); bool isFinished(void);
int fadepos, fadetarget; int fadepos, fadetarget;
int fademode; int fademode;
int minduration; int minduration;
char *filename; char *filename;
public: public:
Sound(Sound *source); Sound(Sound *source);
Sound(char *filename); Sound(char *filename);
Sound(char *filename, int type); Sound(char *filename, int type);
Sound(char *filename, bool loops); Sound(char *filename, bool loops);
Sound(char *filename, int type, bool loops); Sound(char *filename, int type, bool loops);
void load(char *filename, int type, bool loops); void load(char *filename, int type, bool loops);
bool play(void); bool play(void);
//Plays sound for at least minduration frames until sound // Plays sound for at least minduration frames until sound
//can be played again. Doesn't prevent stopping of the sound // can be played again. Doesn't prevent stopping of the sound
void play(int minduration); void play(int minduration);
void stop(); void stop();
void setStopCallback(STOPCALLBACK callback); void setStopCallback(STOPCALLBACK callback);
void setVolume(float volume); void setVolume(float volume);
void fadeIn(int length); void fadeIn(int length);
void fadeOut(int length); void fadeOut(int length);
//Do not use methods below // Do not use methods below
void setFinished(void); void setFinished(void);
void update(void); void update(void);
}; };
void initAudio(void); void initAudio(void);
@ -69,4 +67,3 @@ void uninitAudio(void);
void updateAudio(void); void updateAudio(void);
#endif #endif

113
src/camera.cpp
View file

@ -4,84 +4,77 @@
#include "vector.h" #include "vector.h"
#include "glapi.h" #include "glapi.h"
Camera::Camera(void){ Camera::Camera(void) {
right = &matrix[0]; right = &matrix[0];
up = &matrix[3]; up = &matrix[3];
forward = &matrix[6]; forward = &matrix[6];
vectorSet(position, 0, 2, 2); vectorSet(position, 0, 2, 2);
vectorSet(target, 0, 0, 0); vectorSet(target, 0, 0, 0);
vectorSet(up, 0, 1, 0); vectorSet(up, 0, 1, 0);
calculateMatrix(); calculateMatrix();
} }
void Camera::setPosition(float position[3]){ void Camera::setPosition(float position[3]) {
vectorCopy(this->position, position); vectorCopy(this->position, position);
} }
void Camera::setPosition(float x, float y, float z){ void Camera::setPosition(float x, float y, float z) {
this->position[0] = x; this->position[0] = x;
this->position[1] = y; this->position[1] = y;
this->position[2] = z; this->position[2] = z;
} }
void Camera::getPosition(float *position){ void Camera::getPosition(float *position) {
vectorCopy(position, this->position); vectorCopy(position, this->position);
} }
void Camera::setTarget(float target[3]){ void Camera::setTarget(float target[3]) { vectorCopy(this->target, target); }
vectorCopy(this->target, target);
void Camera::getTarget(float *target) { vectorCopy(target, this->target); }
void Camera::setUp(float up[3]) { vectorCopy(this->up, up); }
void Camera::getMatrix(float *matrix) {
vectorCopy(&matrix[0], &this->matrix[0]);
vectorCopy(&matrix[3], &this->matrix[3]);
vectorCopy(&matrix[6], &this->matrix[6]);
} }
void Camera::getTarget(float *target){ void Camera::moveRight(float amount) {
vectorCopy(target, this->target); float movevector[3];
vectorScale(movevector, right, amount);
vectorAdd(position, movevector);
// vectorAdd(target, movevector);
calculateMatrix();
} }
void Camera::setUp(float up[3]){ void Camera::moveUp(float amount) {
vectorCopy(this->up, up); float movevector[3];
vectorScale(movevector, up, amount);
vectorAdd(position, movevector);
// vectorAdd(target, movevector);
calculateMatrix();
} }
void Camera::getMatrix(float *matrix){ void Camera::moveForward(float amount) {
vectorCopy(&matrix[0], &this->matrix[0]); float movevector[3];
vectorCopy(&matrix[3], &this->matrix[3]); vectorScale(movevector, forward, amount);
vectorCopy(&matrix[6], &this->matrix[6]); vectorAdd(position, movevector);
// vectorAdd(target, movevector);
calculateMatrix();
} }
void Camera::moveRight(float amount){ void Camera::glUpdate(void) {
float movevector[3]; // glLoadIdentity();
vectorScale(movevector, right, amount);
vectorAdd(position, movevector); gluLookAt(position[0], position[1], position[2], target[0], target[1],
//vectorAdd(target, movevector); target[2], up[0], up[1], up[2]);
calculateMatrix();
} }
void Camera::moveUp(float amount){ void Camera::calculateMatrix(void) {
float movevector[3]; vectorSub(forward, target, position);
vectorScale(movevector, up, amount); vectorNormalize(forward);
vectorAdd(position, movevector); vectorCross(right, forward, up);
//vectorAdd(target, movevector);
calculateMatrix();
}
void Camera::moveForward(float amount){
float movevector[3];
vectorScale(movevector, forward, amount);
vectorAdd(position, movevector);
//vectorAdd(target, movevector);
calculateMatrix();
}
void Camera::glUpdate(void){
//glLoadIdentity();
gluLookAt(position[0], position[1], position[2],
target[0], target[1], target[2],
up[0], up[1], up[2]);
}
void Camera::calculateMatrix(void){
vectorSub(forward, target, position);
vectorNormalize(forward);
vectorCross(right, forward, up);
} }

37
src/camera.h
View file

@ -1,32 +1,31 @@
#ifndef __CAMERA_H_INCLUDED__ #ifndef __CAMERA_H_INCLUDED__
#define __CAMERA_H_INCLUDED__ #define __CAMERA_H_INCLUDED__
class Camera{ class Camera {
private: private:
float position[3]; float position[3];
float target[3]; float target[3];
float matrix[9]; float matrix[9];
float *right, *up, *forward; float *right, *up, *forward;
void calculateMatrix(void); void calculateMatrix(void);
public: public:
Camera(void); Camera(void);
void setPosition(float position[3]); void setPosition(float position[3]);
void setPosition(float x, float y, float z); void setPosition(float x, float y, float z);
void getPosition(float *position); void getPosition(float *position);
void setTarget(float target[3]); void setTarget(float target[3]);
void getTarget(float *target); void getTarget(float *target);
void setUp(float up[3]); void setUp(float up[3]);
void getMatrix(float *matrix); void getMatrix(float *matrix);
void moveRight(float amount); void moveRight(float amount);
void moveUp(float amount); void moveUp(float amount);
void moveForward(float amount); void moveForward(float amount);
void glUpdate(void); void glUpdate(void);
}; };
#endif #endif

1133
src/collision.cpp
View file

File diff suppressed because it is too large Load diff

43
src/collision.h
View file

@ -5,43 +5,44 @@
class ObjectLink; class ObjectLink;
#define COLLISIONGROUP_NONE 0 #define COLLISIONGROUP_NONE 0
#define COLLISIONGROUP_ARENA 1 #define COLLISIONGROUP_ARENA 1
#define COLLISIONGROUP_MAN1 2 #define COLLISIONGROUP_MAN1 2
#define COLLISIONGROUP_MAN1HAND 3 #define COLLISIONGROUP_MAN1HAND 3
#define COLLISIONGROUP_MAN2 4 #define COLLISIONGROUP_MAN2 4
#define COLLISIONGROUP_MAN2HAND 5 #define COLLISIONGROUP_MAN2HAND 5
#define COLLISIONGROUP_PARTICLE 6 #define COLLISIONGROUP_PARTICLE 6
#define COLLISIONFRICTION 0.9 #define COLLISIONFRICTION 0.9
void initCollisions(void); void initCollisions(void);
//void addCollisionObject(Object *object, int group); // void addCollisionObject(Object *object, int group);
void addCollisionLink(int source, int target); void addCollisionLink(int source, int target);
void removeCollisionLink(int source, int target); void removeCollisionLink(int source, int target);
bool isCollisionLink(int source, int target); bool isCollisionLink(int source, int target);
class Contact{ class Contact {
public: public:
Object *object1, *object2; Object *object1, *object2;
float normal[3]; float normal[3];
float position[3]; float position[3];
}; };
extern Contact *contacts; extern Contact *contacts;
extern int contactcount; extern int contactcount;
// Contact point is world-relative and must be transformed
//Contact point is world-relative and must be transformed // into coordinate system of both objects
//into coordinate system of both objects void addCollision(Object *source, Object *target, float *normal,
void addCollision(Object *source, Object *target, float *contactpoint);
float *normal, float *contactpoint);
bool handleCollision(Contact *contact); bool handleCollision(Contact *contact);
bool handleLink(ObjectLink *link); bool handleLink(ObjectLink *link);
bool checkSphereMeshCollision(float *sphereposition, float r, Mesh *mesh, float *normal, float *contactpoint); bool checkSphereMeshCollision(float *sphereposition, float r, Mesh *mesh,
bool checkPointMeshCollision(float *position, Mesh *mesh, float *normal, float *contactpoint); float *normal, float *contactpoint);
bool checkEdgeMeshCollision(float *p1, float *p2, Mesh *mesh, float *normal, float *contactpoint); bool checkPointMeshCollision(float *position, Mesh *mesh, float *normal,
float *contactpoint);
bool checkEdgeMeshCollision(float *p1, float *p2, Mesh *mesh, float *normal,
float *contactpoint);
#endif #endif

166
src/end.cpp
View file

@ -27,118 +27,122 @@
Camera endcamera; Camera endcamera;
Light endlight, endlight2; Light endlight, endlight2;
//BasicBlockAppearance *endfloor = new BasicBlockAppearance(100, 1, 100); // BasicBlockAppearance *endfloor = new BasicBlockAppearance(100, 1, 100);
BasicBlock *endfloor;// = new BasicBlock(20, 1, 15); BasicBlock *endfloor; // = new BasicBlock(20, 1, 15);
void initEnd(void){ void initEnd(void) {
endlight.setColor(1, 1, 1); endlight.setColor(1, 1, 1);
endlight.setSpecular(1, 1, 1); endlight.setSpecular(1, 1, 1);
endlight.setPosition(-0.5, BLOCKHEIGHT*16, 0.5); endlight.setPosition(-0.5, BLOCKHEIGHT * 16, 0.5);
endlight.setAttenuation(0, 0.0, 0.005); endlight.setAttenuation(0, 0.0, 0.005);
endlight2.setColor(1, 1, 1); endlight2.setColor(1, 1, 1);
endlight2.setSpecular(1, 1, 1); endlight2.setSpecular(1, 1, 1);
endlight2.setAttenuation(1.0, 0.0, 0.0); endlight2.setAttenuation(1.0, 0.0, 0.0);
endfloor = new BasicBlock(30, 1, 20); endfloor = new BasicBlock(30, 1, 20);
//endfloor->material.setColor(0, 1, 0, 1); // endfloor->material.setColor(0, 1, 0, 1);
endfloor->setColor(0, 1, 0); endfloor->setColor(0, 1, 0);
endfloor->setPosition(-10, -BLOCKHEIGHT*0.5, 0); endfloor->setPosition(-10, -BLOCKHEIGHT * 0.5, 0);
endfloor->prepare(); endfloor->prepare();
} }
int endingcounter; int endingcounter;
void endRestart(void){ void endRestart(void) {
endingcounter = 0; endingcounter = 0;
//initEnd(); // initEnd();
//endfloor->prepare(); // endfloor->prepare();
} }
void stopEnding(void){ void stopEnding(void) {
endlight.setEnabled(false); endlight.setEnabled(false);
changeGameMode(MENUMODE); changeGameMode(MENUMODE);
fightmusic->fadeOut(300); fightmusic->fadeOut(300);
menuRestart(); menuRestart();
} }
float endfade; float endfade;
void calculateEnd(int framecount){ void calculateEnd(int framecount) {
endfade = -1; endfade = -1;
if (endingcounter < 200){ if (endingcounter < 200) {
endfade = 1-(float)endingcounter/200; endfade = 1 - (float)endingcounter / 200;
} }
endingcounter++; endingcounter++;
endlight.setEnabled(true); endlight.setEnabled(true);
//endlight2.setEnabled(true); // endlight2.setEnabled(true);
float target[3] = {0, 13, 0}; float target[3] = {0, 13, 0};
endcamera.setTarget(target); endcamera.setTarget(target);
endcamera.setPosition(10+sin(framecount*0.002)*2, 20+sin(framecount*0.0017)*2, 25+cos(framecount*0.002)*2); endcamera.setPosition(10 + sin(framecount * 0.002) * 2,
//endcamera.setPosition(sin(framecount*0.01)*25, sin(framecount*0.007)*6+20, cos(framecount*0.01)*25); 20 + sin(framecount * 0.0017) * 2,
25 + cos(framecount * 0.002) * 2);
// endcamera.setPosition(sin(framecount*0.01)*25, sin(framecount*0.007)*6+20,
// cos(framecount*0.01)*25);
//endlight.setPosition(40, 20, 0); // endlight.setPosition(40, 20, 0);
endlight.setPosition(-sin(framecount*0.007)*10, 15, cos(framecount*0.007)*2+22); endlight.setPosition(-sin(framecount * 0.007) * 10, 15,
cos(framecount * 0.007) * 2 + 22);
if (keys[SDLK_ESCAPE]){ if (keys[SDLK_ESCAPE]) {
stopEnding(); stopEnding();
} }
} }
void drawEnd(int framecount){ void drawEnd(int framecount) {
glLoadIdentity(); glLoadIdentity();
glTranslatef(10, 0, 0); glTranslatef(10, 0, 0);
endcamera.glUpdate(); endcamera.glUpdate();
updateLights(); updateLights();
glEnable(GL_LIGHTING); glEnable(GL_LIGHTING);
glDisable(GL_BLEND); glDisable(GL_BLEND);
glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
endfloor->draw(); endfloor->draw();
glColor3f(1, 1, 0); glColor3f(1, 1, 0);
drawTrophy(); drawTrophy();
glRotatef(270, 0, 1, 0); glRotatef(270, 0, 1, 0);
glTranslatef(2-BLOCKHEIGHT*0.5, 0, 15-BLOCKHEIGHT*0.5); glTranslatef(2 - BLOCKHEIGHT * 0.5, 0, 15 - BLOCKHEIGHT * 0.5);
glScalef(3, 3, 3); glScalef(3, 3, 3);
winner->head->draw(); winner->head->draw();
winner->torso->draw(); winner->torso->draw();
winner->lefthand->draw(); winner->lefthand->draw();
winner->righthand->draw(); winner->righthand->draw();
winner->waist->draw(); winner->waist->draw();
winner->leftleg->draw(); winner->leftleg->draw();
winner->rightleg->draw(); winner->rightleg->draw();
enable2D();
enable2D(); glColor3f(1, 1, 1);
glColor3f(1, 1, 1); if (winner->side == PLAYER1)
print(0.05, 0.05, "Player 1 is\nthe winner", 0.09);
if (winner->side == PLAYER2)
print(0.05, 0.05, "Player 2 is\nthe winner", 0.09);
if (winner->side == PLAYER1) print(0.05, 0.05, "Player 1 is\nthe winner", 0.09); if (endfade != -1) {
if (winner->side == PLAYER2) print(0.05, 0.05, "Player 2 is\nthe winner", 0.09); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(0, 0, 0, endfade);
glBegin(GL_QUADS);
glVertex2f(0, 0);
glVertex2f(1, 0);
glVertex2f(1, 1);
glVertex2f(0, 1);
glEnd();
}
disable2D();
if (endfade != -1){
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(0, 0, 0, endfade);
glBegin(GL_QUADS);
glVertex2f(0, 0);
glVertex2f(1, 0);
glVertex2f(1, 1);
glVertex2f(0, 1);
glEnd();
}
disable2D();
} }

2
src/end.h
View file

@ -6,11 +6,9 @@
#include "texture.h" #include "texture.h"
#include "audio.h" #include "audio.h"
void initEnd(void); void initEnd(void);
void endRestart(void); void endRestart(void);
void calculateEnd(int framecount); void calculateEnd(int framecount);
void drawEnd(int framecount); void drawEnd(int framecount);
#endif #endif

902
src/fight.cpp
View file

@ -46,273 +46,275 @@ int points1, points2;
bool fightinitialized = false; bool fightinitialized = false;
void initFight(void){ void initFight(void) {
if (!fightinitialized){ if (!fightinitialized) {
initCollisions(); initCollisions();
addCollisionLink(COLLISIONGROUP_ARENA, COLLISIONGROUP_PARTICLE); addCollisionLink(COLLISIONGROUP_ARENA, COLLISIONGROUP_PARTICLE);
//addCollisionLink(COLLISIONGROUP_PARTICLE, COLLISIONGROUP_PARTICLE); // addCollisionLink(COLLISIONGROUP_PARTICLE, COLLISIONGROUP_PARTICLE);
addCollisionLink(COLLISIONGROUP_MAN1, COLLISIONGROUP_ARENA); addCollisionLink(COLLISIONGROUP_MAN1, COLLISIONGROUP_ARENA);
//addCollisionLink(COLLISIONGROUP_MAN1, COLLISIONGROUP_PARTICLE); // addCollisionLink(COLLISIONGROUP_MAN1, COLLISIONGROUP_PARTICLE);
addCollisionLink(COLLISIONGROUP_MAN1, COLLISIONGROUP_MAN1); addCollisionLink(COLLISIONGROUP_MAN1, COLLISIONGROUP_MAN1);
addCollisionLink(COLLISIONGROUP_MAN1HAND, COLLISIONGROUP_ARENA); addCollisionLink(COLLISIONGROUP_MAN1HAND, COLLISIONGROUP_ARENA);
//addCollisionLink(COLLISIONGROUP_MAN1HAND, COLLISIONGROUP_PARTICLE); // addCollisionLink(COLLISIONGROUP_MAN1HAND, COLLISIONGROUP_PARTICLE);
addCollisionLink(COLLISIONGROUP_MAN2, COLLISIONGROUP_ARENA); addCollisionLink(COLLISIONGROUP_MAN2, COLLISIONGROUP_ARENA);
//addCollisionLink(COLLISIONGROUP_MAN2, COLLISIONGROUP_PARTICLE); // addCollisionLink(COLLISIONGROUP_MAN2, COLLISIONGROUP_PARTICLE);
addCollisionLink(COLLISIONGROUP_MAN2, COLLISIONGROUP_MAN2); addCollisionLink(COLLISIONGROUP_MAN2, COLLISIONGROUP_MAN2);
addCollisionLink(COLLISIONGROUP_MAN2HAND, COLLISIONGROUP_ARENA); addCollisionLink(COLLISIONGROUP_MAN2HAND, COLLISIONGROUP_ARENA);
//addCollisionLink(COLLISIONGROUP_MAN2HAND, COLLISIONGROUP_PARTICLE); // addCollisionLink(COLLISIONGROUP_MAN2HAND, COLLISIONGROUP_PARTICLE);
addCollisionLink(COLLISIONGROUP_MAN1, COLLISIONGROUP_MAN2); addCollisionLink(COLLISIONGROUP_MAN1, COLLISIONGROUP_MAN2);
addCollisionLink(COLLISIONGROUP_MAN1, COLLISIONGROUP_MAN2HAND); addCollisionLink(COLLISIONGROUP_MAN1, COLLISIONGROUP_MAN2HAND);
addCollisionLink(COLLISIONGROUP_MAN1HAND, COLLISIONGROUP_MAN2); addCollisionLink(COLLISIONGROUP_MAN1HAND, COLLISIONGROUP_MAN2);
addCollisionLink(COLLISIONGROUP_MAN1HAND, COLLISIONGROUP_MAN2HAND); addCollisionLink(COLLISIONGROUP_MAN1HAND, COLLISIONGROUP_MAN2HAND);
//Sound* backgroundsong = new Sound("mixdown.mp3"); // Sound* backgroundsong = new Sound("mixdown.mp3");
Sound* backgroundsong = new Sound(BGSONG, true); Sound *backgroundsong = new Sound(BGSONG, true);
camera.setPosition(-5, 8, 18); camera.setPosition(-5, 8, 18);
arenaworld = new World(); arenaworld = new World();
// arenalight.setEnabled(true);
/*arenalight.setPosition(0, 10, 0);
Object *lamp = new Object();
lamp->appearance = new LampAppearance();
lamp->setPosition(0, 10, 0);
arenaworld->addChild(lamp);*/
}
//arenalight.setEnabled(true); light1.setColor(1, 1, 1);
/*arenalight.setPosition(0, 10, 0); light1.setSpecular(1, 1, 1);
Object *lamp = new Object(); light1.setPosition(-ARENASIZE + 0.5, 5, -ARENASIZE + 0.5);
lamp->appearance = new LampAppearance(); light1.setAttenuation(0.2, 0.0, 0.02);
lamp->setPosition(0, 10, 0);
arenaworld->addChild(lamp);*/
} light2.setColor(1, 1, 1);
light2.setSpecular(1, 1, 1);
light2.setPosition(ARENASIZE - 0.5, 5, -ARENASIZE + 0.5);
light2.setAttenuation(0.2, 0.0, 0.02);
light1.setColor(1, 1, 1); light3.setColor(1, 1, 1);
light1.setSpecular(1, 1, 1); light3.setSpecular(1, 1, 1);
light1.setPosition(-ARENASIZE+0.5, 5, -ARENASIZE+0.5); light3.setPosition(-ARENASIZE + 0.5, 5, ARENASIZE - 0.5);
light1.setAttenuation(0.2, 0.0, 0.02); light3.setAttenuation(0.2, 0.0, 0.02);
light2.setColor(1, 1, 1); light4.setColor(1, 1, 1);
light2.setSpecular(1, 1, 1); light4.setSpecular(1, 1, 1);
light2.setPosition(ARENASIZE-0.5, 5, -ARENASIZE+0.5); light4.setPosition(ARENASIZE - 0.5, 5, ARENASIZE - 0.5);
light2.setAttenuation(0.2, 0.0, 0.02); light4.setAttenuation(0.2, 0.0, 0.02);
light3.setColor(1, 1, 1); if (!fightinitialized) {
light3.setSpecular(1, 1, 1); Object *lamp;
light3.setPosition(-ARENASIZE+0.5, 5, ARENASIZE-0.5);
light3.setAttenuation(0.2, 0.0, 0.02);
light4.setColor(1, 1, 1); lamp = new Object();
light4.setSpecular(1, 1, 1); lamp->appearance = new LampAppearance();
light4.setPosition(ARENASIZE-0.5, 5, ARENASIZE-0.5); lamp->setPosition(-ARENASIZE + 0.5, (ARENAHEIGHT + 0.5) * BLOCKHEIGHT,
light4.setAttenuation(0.2, 0.0, 0.02); -ARENASIZE + 0.5);
arenaworld->addChild(lamp);
lamp = new Object();
lamp->appearance = new LampAppearance();
lamp->setPosition(ARENASIZE - 0.5, (ARENAHEIGHT + 0.5) * BLOCKHEIGHT,
-ARENASIZE + 0.5);
arenaworld->addChild(lamp);
if (!fightinitialized){ lamp = new Object();
Object *lamp; lamp->appearance = new LampAppearance();
lamp->setPosition(-ARENASIZE + 0.5, (ARENAHEIGHT + 0.5) * BLOCKHEIGHT,
ARENASIZE - 0.5);
arenaworld->addChild(lamp);
lamp = new Object(); lamp = new Object();
lamp->appearance = new LampAppearance(); lamp->appearance = new LampAppearance();
lamp->setPosition(-ARENASIZE+0.5, (ARENAHEIGHT+0.5)*BLOCKHEIGHT, -ARENASIZE+0.5); lamp->setPosition(ARENASIZE - 0.5, (ARENAHEIGHT + 0.5) * BLOCKHEIGHT,
arenaworld->addChild(lamp); ARENASIZE - 0.5);
arenaworld->addChild(lamp);
lamp = new Object(); // Floor
lamp->appearance = new LampAppearance(); BasicBlock *floorblock;
lamp->setPosition(ARENASIZE-0.5, (ARENAHEIGHT+0.5)*BLOCKHEIGHT, -ARENASIZE+0.5); floorblock = new BasicBlock(ARENASIZE * 2, 3, ARENASIZE * 2);
arenaworld->addChild(lamp); floorblock->setPosition(0, -BLOCKHEIGHT * 3 / 2.0, 0);
floorblock->setColor(0, 1, 0);
floorblock->setCollisionGroup(COLLISIONGROUP_ARENA);
arenaworld->addChild(floorblock);
lamp = new Object(); // Corners
lamp->appearance = new LampAppearance(); BasicBlock *arenacorner;
lamp->setPosition(-ARENASIZE+0.5, (ARENAHEIGHT+0.5)*BLOCKHEIGHT, ARENASIZE-0.5);
arenaworld->addChild(lamp);
lamp = new Object(); arenacorner = new BasicBlock(1, ARENAHEIGHT, 1);
lamp->appearance = new LampAppearance(); arenacorner->setColor(1, 0, 0);
lamp->setPosition(ARENASIZE-0.5, (ARENAHEIGHT+0.5)*BLOCKHEIGHT, ARENASIZE-0.5); // arenacorner->setCollisionGroup(COLLISIONGROUP_ARENA);
arenaworld->addChild(lamp); arenacorner->setPosition(ARENASIZE - 0.5, BLOCKHEIGHT * ARENAHEIGHT / 2.0,
ARENASIZE - 0.5);
arenaworld->addChild(arenacorner);
arenacorner = new BasicBlock(1, ARENAHEIGHT, 1);
arenacorner->setColor(1, 0, 0);
// arenacorner->setCollisionGroup(COLLISIONGROUP_ARENA);
arenacorner->setPosition(-ARENASIZE + 0.5, BLOCKHEIGHT * ARENAHEIGHT / 2.0,
ARENASIZE - 0.5);
arenaworld->addChild(arenacorner);
//Floor arenacorner = new BasicBlock(1, ARENAHEIGHT, 1);
BasicBlock *floorblock; arenacorner->setColor(1, 0, 0);
floorblock = new BasicBlock(ARENASIZE*2, 3, ARENASIZE*2); // arenacorner->setCollisionGroup(COLLISIONGROUP_ARENA);
floorblock->setPosition(0, -BLOCKHEIGHT*3/2.0, 0); arenacorner->setPosition(ARENASIZE - 0.5, BLOCKHEIGHT * ARENAHEIGHT / 2.0,
floorblock->setColor(0, 1, 0); -ARENASIZE + 0.5);
floorblock->setCollisionGroup(COLLISIONGROUP_ARENA); arenaworld->addChild(arenacorner);
arenaworld->addChild(floorblock);
arenacorner = new BasicBlock(1, ARENAHEIGHT, 1);
arenacorner->setColor(1, 0, 0);
// arenacorner->setCollisionGroup(COLLISIONGROUP_ARENA);
arenacorner->setPosition(-ARENASIZE + 0.5, BLOCKHEIGHT * ARENAHEIGHT / 2.0,
-ARENASIZE + 0.5);
arenaworld->addChild(arenacorner);
//Corners //"Ropes"
BasicBlock *arenacorner; MeshObject *arenaline;
Mesh *linegeometry;
MultiAppearance *lineappearance;
BasicBlockAppearance *line;
int geometryheight = BLOCKHEIGHT * ARENAHEIGHT;
arenacorner = new BasicBlock(1, ARENAHEIGHT, 1); linegeometry =
arenacorner->setColor(1, 0, 0); createBox(-0.5, 0.5, -geometryheight / 2,
//arenacorner->setCollisionGroup(COLLISIONGROUP_ARENA); geometryheight / 2 - BLOCKHEIGHT, -ARENASIZE, ARENASIZE);
arenacorner->setPosition(ARENASIZE-0.5, BLOCKHEIGHT*ARENAHEIGHT/2.0, ARENASIZE-0.5); arenaline = new MeshObject(linegeometry);
arenaworld->addChild(arenacorner); lineappearance = new MultiAppearance();
line = new BasicBlockAppearance(1, 1, ARENASIZE * 2);
vectorSet(line->displacement, 0, -BLOCKHEIGHT * 2.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(1, 1, ARENASIZE * 2);
vectorSet(line->displacement, 0, BLOCKHEIGHT * 0.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(1, 1, ARENASIZE * 2);
vectorSet(line->displacement, 0, BLOCKHEIGHT * 3.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line), arenaline->appearance = lineappearance;
arenaline->setCollisionGroup(COLLISIONGROUP_ARENA);
arenaline->setPosition(-ARENASIZE + 0.5, geometryheight / 2, 0);
arenaworld->addChild(arenaline);
arenacorner = new BasicBlock(1, ARENAHEIGHT, 1); linegeometry =
arenacorner->setColor(1, 0, 0); createBox(-0.5, 0.5, -geometryheight / 2,
//arenacorner->setCollisionGroup(COLLISIONGROUP_ARENA); geometryheight / 2 - BLOCKHEIGHT, -ARENASIZE, ARENASIZE);
arenacorner->setPosition(-ARENASIZE+0.5, BLOCKHEIGHT*ARENAHEIGHT/2.0, ARENASIZE-0.5); arenaline = new MeshObject(linegeometry);
arenaworld->addChild(arenacorner); lineappearance = new MultiAppearance();
line = new BasicBlockAppearance(1, 1, ARENASIZE * 2);
vectorSet(line->displacement, 0, -BLOCKHEIGHT * 2.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(1, 1, ARENASIZE * 2);
vectorSet(line->displacement, 0, BLOCKHEIGHT * 0.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(1, 1, ARENASIZE * 2);
vectorSet(line->displacement, 0, BLOCKHEIGHT * 3.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line), arenaline->appearance = lineappearance;
arenaline->setCollisionGroup(COLLISIONGROUP_ARENA);
arenaline->setPosition(ARENASIZE - 0.5, geometryheight / 2, 0);
arenaworld->addChild(arenaline);
arenacorner = new BasicBlock(1, ARENAHEIGHT, 1); linegeometry = createBox(-ARENASIZE, ARENASIZE, -geometryheight / 2,
arenacorner->setColor(1, 0, 0); geometryheight / 2 - BLOCKHEIGHT, -0.5, 0.5);
//arenacorner->setCollisionGroup(COLLISIONGROUP_ARENA); arenaline = new MeshObject(linegeometry);
arenacorner->setPosition(ARENASIZE-0.5, BLOCKHEIGHT*ARENAHEIGHT/2.0, -ARENASIZE+0.5); lineappearance = new MultiAppearance();
arenaworld->addChild(arenacorner); line = new BasicBlockAppearance(ARENASIZE * 2, 1, 1);
vectorSet(line->displacement, 0, -BLOCKHEIGHT * 2.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(ARENASIZE * 2, 1, 1);
vectorSet(line->displacement, 0, BLOCKHEIGHT * 0.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(ARENASIZE * 2, 1, 1);
vectorSet(line->displacement, 0, BLOCKHEIGHT * 3.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line), arenaline->appearance = lineappearance;
arenaline->setCollisionGroup(COLLISIONGROUP_ARENA);
arenaline->setPosition(0, geometryheight / 2, -ARENASIZE + 0.5);
arenaworld->addChild(arenaline);
arenacorner = new BasicBlock(1, ARENAHEIGHT, 1); linegeometry = createBox(-ARENASIZE, ARENASIZE, -geometryheight / 2,
arenacorner->setColor(1, 0, 0); geometryheight / 2 - BLOCKHEIGHT, -0.5, 0.5);
//arenacorner->setCollisionGroup(COLLISIONGROUP_ARENA); arenaline = new MeshObject(linegeometry);
arenacorner->setPosition(-ARENASIZE+0.5, BLOCKHEIGHT*ARENAHEIGHT/2.0, -ARENASIZE+0.5); lineappearance = new MultiAppearance();
arenaworld->addChild(arenacorner); line = new BasicBlockAppearance(ARENASIZE * 2, 1, 1);
vectorSet(line->displacement, 0, -BLOCKHEIGHT * 2.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(ARENASIZE * 2, 1, 1);
vectorSet(line->displacement, 0, BLOCKHEIGHT * 0.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(ARENASIZE * 2, 1, 1);
vectorSet(line->displacement, 0, BLOCKHEIGHT * 3.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line), arenaline->appearance = lineappearance;
arenaline->setCollisionGroup(COLLISIONGROUP_ARENA);
arenaline->setPosition(0, geometryheight / 2, ARENASIZE - 0.5);
arenaworld->addChild(arenaline);
float movement[3];
//"Ropes" man1 = new Legoman(PLAYER1);
MeshObject *arenaline; man1->insertToWorld(arenaworld);
Mesh *linegeometry; vectorSet(movement, -4, 0, 0);
MultiAppearance *lineappearance; man1->move(movement);
BasicBlockAppearance *line; man1->lockPart(LEFTLEG | RIGHTLEG);
int geometryheight = BLOCKHEIGHT*ARENAHEIGHT;
linegeometry = createBox(-0.5, 0.5, -geometryheight/2, geometryheight/2-BLOCKHEIGHT, -ARENASIZE, ARENASIZE); man2 = new Legoman(PLAYER2);
arenaline = new MeshObject(linegeometry); man2->insertToWorld(arenaworld);
lineappearance = new MultiAppearance(); vectorSet(movement, 4, 0, 0);
line = new BasicBlockAppearance(1, 1, ARENASIZE*2); man2->move(movement);
vectorSet(line->displacement, 0, -BLOCKHEIGHT*2.5, 0); man2->lockPart(LEFTLEG | RIGHTLEG);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(1, 1, ARENASIZE*2);
vectorSet(line->displacement, 0, BLOCKHEIGHT*0.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(1, 1, ARENASIZE*2);
vectorSet(line->displacement, 0, BLOCKHEIGHT*3.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
arenaline->appearance = lineappearance;
arenaline->setCollisionGroup(COLLISIONGROUP_ARENA);
arenaline->setPosition(-ARENASIZE+0.5, geometryheight/2, 0);
arenaworld->addChild(arenaline);
linegeometry = createBox(-0.5, 0.5, -geometryheight/2, geometryheight/2-BLOCKHEIGHT, -ARENASIZE, ARENASIZE); man1->addOpponent(man2);
arenaline = new MeshObject(linegeometry); man2->addOpponent(man1);
lineappearance = new MultiAppearance();
line = new BasicBlockAppearance(1, 1, ARENASIZE*2);
vectorSet(line->displacement, 0, -BLOCKHEIGHT*2.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(1, 1, ARENASIZE*2);
vectorSet(line->displacement, 0, BLOCKHEIGHT*0.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(1, 1, ARENASIZE*2);
vectorSet(line->displacement, 0, BLOCKHEIGHT*3.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
arenaline->appearance = lineappearance;
arenaline->setCollisionGroup(COLLISIONGROUP_ARENA);
arenaline->setPosition(ARENASIZE-0.5, geometryheight/2, 0);
arenaworld->addChild(arenaline);
linegeometry = createBox(-ARENASIZE, ARENASIZE, -geometryheight/2, geometryheight/2-BLOCKHEIGHT, -0.5, 0.5); initBloods(arenaworld);
arenaline = new MeshObject(linegeometry);
lineappearance = new MultiAppearance();
line = new BasicBlockAppearance(ARENASIZE*2, 1, 1);
vectorSet(line->displacement, 0, -BLOCKHEIGHT*2.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(ARENASIZE*2, 1, 1);
vectorSet(line->displacement, 0, BLOCKHEIGHT*0.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(ARENASIZE*2, 1, 1);
vectorSet(line->displacement, 0, BLOCKHEIGHT*3.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
arenaline->appearance = lineappearance;
arenaline->setCollisionGroup(COLLISIONGROUP_ARENA);
arenaline->setPosition(0, geometryheight/2, -ARENASIZE+0.5);
arenaworld->addChild(arenaline);
linegeometry = createBox(-ARENASIZE, ARENASIZE, -geometryheight/2, geometryheight/2-BLOCKHEIGHT, -0.5, 0.5); hitsound1 = new Sound(DATAPATH "hit1.wav");
arenaline = new MeshObject(linegeometry); softhitsound1 = new Sound(DATAPATH "hitsoft1.wav");
lineappearance = new MultiAppearance(); softhitsound2 = new Sound(DATAPATH "hitsoft2.wav");
line = new BasicBlockAppearance(ARENASIZE*2, 1, 1); jumpsound = new Sound(DATAPATH "jump.wav");
vectorSet(line->displacement, 0, -BLOCKHEIGHT*2.5, 0); fallsound1 = new Sound(DATAPATH "fall1.wav");
line->material.setColor(1, 0, 0, 1); fallsound2 = new Sound(DATAPATH "fall2.wav");
lineappearance->addAppearance(line), fightsound = new Sound(DATAPATH "fight.wav");
line = new BasicBlockAppearance(ARENASIZE*2, 1, 1); victorysound = new Sound(DATAPATH "victory.wav");
vectorSet(line->displacement, 0, BLOCKHEIGHT*0.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
line = new BasicBlockAppearance(ARENASIZE*2, 1, 1);
vectorSet(line->displacement, 0, BLOCKHEIGHT*3.5, 0);
line->material.setColor(1, 0, 0, 1);
lineappearance->addAppearance(line),
arenaline->appearance = lineappearance;
arenaline->setCollisionGroup(COLLISIONGROUP_ARENA);
arenaline->setPosition(0, geometryheight/2, ARENASIZE-0.5);
arenaworld->addChild(arenaline);
float movement[3]; fightmusic = new Sound(DATAPATH "fight.mp3", true);
}
man1 = new Legoman(PLAYER1); float cameraTarget[3] = {0, 6, 0};
man1->insertToWorld(arenaworld); camera.setTarget(cameraTarget);
vectorSet(movement, -4, 0, 0); arenaworld->prepare();
man1->move(movement);
man1->lockPart(LEFTLEG | RIGHTLEG);
man2 = new Legoman(PLAYER2); points1 = 0;
man2->insertToWorld(arenaworld); points2 = 0;
vectorSet(movement, 4, 0, 0);
man2->move(movement);
man2->lockPart(LEFTLEG | RIGHTLEG);
man1->addOpponent(man2); winner = man1;
man2->addOpponent(man1);
initBloods(arenaworld);
hitsound1 = new Sound(DATAPATH"hit1.wav");
softhitsound1 = new Sound(DATAPATH"hitsoft1.wav");
softhitsound2 = new Sound(DATAPATH"hitsoft2.wav");
jumpsound = new Sound(DATAPATH"jump.wav");
fallsound1 = new Sound(DATAPATH"fall1.wav");
fallsound2 = new Sound(DATAPATH"fall2.wav");
fightsound = new Sound(DATAPATH"fight.wav");
victorysound = new Sound(DATAPATH"victory.wav");
fightmusic = new Sound(DATAPATH"fight.mp3", true);
}
float cameraTarget[3] = {0, 6, 0};
camera.setTarget(cameraTarget);
arenaworld->prepare();
points1 = 0;
points2 = 0;
winner = man1;
} }
#define MAXSCORE 3 #define MAXSCORE 3
int trophycounter = -1; int trophycounter = -1;
void resetFight(void){ void resetFight(void) {
float movement[3]; float movement[3];
man1->heal(); man1->heal();
man2->heal(); man2->heal();
vectorSet(movement, -4, 0, 0); vectorSet(movement, -4, 0, 0);
man1->move(movement); man1->move(movement);
vectorSet(movement, 4, 0, 0); vectorSet(movement, 4, 0, 0);
man2->move(movement); man2->move(movement);
man1->lockPart(LEFTLEG | RIGHTLEG); man1->lockPart(LEFTLEG | RIGHTLEG);
man2->lockPart(LEFTLEG | RIGHTLEG); man2->lockPart(LEFTLEG | RIGHTLEG);
} }
int startcounter, endcounter; int startcounter, endcounter;
@ -323,23 +325,23 @@ bool dead;
Legoman *winner; Legoman *winner;
void gameOver(Legoman *loser){ void gameOver(Legoman *loser) {
endcounter = 0; endcounter = 0;
dead = true; dead = true;
winner = loser->getOpponent(); winner = loser->getOpponent();
} }
void startFight(void){ void startFight(void) {
resetFight(); resetFight();
fightmusic->setVolume(0); fightmusic->setVolume(0);
fightmusic->play(); fightmusic->play();
fightmusic->fadeIn(300); fightmusic->fadeIn(300);
startcounter = 0; startcounter = 0;
trophycounter = -1; trophycounter = -1;
fightfade = 1; fightfade = 1;
dead = false; dead = false;
points1 = 0; points1 = 0;
points2 = 0; points2 = 0;
} }
SDLKey player1left = SDLK_LEFT; SDLKey player1left = SDLK_LEFT;
@ -356,29 +358,26 @@ SDLKey player2backward = SDLK_s;
SDLKey player2jump = SDLK_LSHIFT; SDLKey player2jump = SDLK_LSHIFT;
SDLKey player2hit = SDLK_LCTRL; SDLKey player2hit = SDLK_LCTRL;
void stopGame(void) {
void stopGame(void){ light1.setEnabled(false);
light1.setEnabled(false); light2.setEnabled(false);
light2.setEnabled(false); light3.setEnabled(false);
light3.setEnabled(false); light4.setEnabled(false);
light4.setEnabled(false); changeGameMode(MENUMODE);
changeGameMode(MENUMODE); fightmusic->fadeOut(300);
fightmusic->fadeOut(300); menuRestart();
menuRestart();
} }
void endGame(void){ void endGame(void) { trophycounter = 0; }
trophycounter = 0;
}
void endGame2(void){ void endGame2(void) {
light1.setEnabled(false); light1.setEnabled(false);
light2.setEnabled(false); light2.setEnabled(false);
light3.setEnabled(false); light3.setEnabled(false);
light4.setEnabled(false); light4.setEnabled(false);
changeGameMode(ENDMODE); changeGameMode(ENDMODE);
winner->heal(); winner->heal();
endRestart(); endRestart();
} }
#define READY 250 #define READY 250
@ -390,208 +389,219 @@ void endGame2(void){
#define TROPHYFADE 400 #define TROPHYFADE 400
void calculateFight(int framecount){ void calculateFight(int framecount) {
fightfade = -1; fightfade = -1;
if (startcounter < 200){ if (startcounter < 200) {
fightfade = (200-startcounter)/200.0; fightfade = (200 - startcounter) / 200.0;
} }
if (startcounter == FIGHT - 30){ if (startcounter == FIGHT - 30) {
fightsound->play(); fightsound->play();
} }
startcounter++; startcounter++;
if (endcounter == VICTORY){ if (endcounter == VICTORY) {
victorysound->play(); victorysound->play();
if (winner == man1) points1++; if (winner == man1)
if (winner == man2) points2++; points1++;
if (winner == man2)
points2++;
}
if (endcounter >= ENDFADE && endcounter <= STARTOVER) {
fightfade = (endcounter - ENDFADE) / (STARTOVER - ENDFADE);
}
if (endcounter == STARTOVER) {
if (points1 == MAXSCORE || points2 == MAXSCORE) {
endGame();
} else {
startcounter = 0;
resetFight();
dead = false;
endcounter = 0;
} }
if (endcounter >= ENDFADE && endcounter <= STARTOVER){ }
fightfade = (endcounter - ENDFADE)/(STARTOVER-ENDFADE); if (dead)
} endcounter++;
if (endcounter == STARTOVER){ if (trophycounter != -1) {
if (points1 == MAXSCORE || points2 == MAXSCORE){ fightfade = (float)trophycounter / TROPHYFADE;
endGame(); trophycounter++;
} else{ if (trophycounter == TROPHYFADE)
startcounter = 0; endGame2();
resetFight(); }
dead = false;
endcounter = 0; /*if (framecount % 10 == 0){
} float pos[3] = {0, 5, 0};
} float vel[3] = {randomf(2)-1, randomf(2)-1, randomf(2)-1};
if (dead) endcounter++; createBlood(pos, vel);
if (trophycounter != -1){ }*/
fightfade = (float)trophycounter/TROPHYFADE; // arenalight.setPosition(sin(framecount*0.01)*6, 3, cos(framecount*0.01)*4);
trophycounter++; // light2.setPosition(sin(framecount*0.017)*6, 2, cos(framecount*0.027)*5);
if (trophycounter == TROPHYFADE) endGame2(); // light3.setPosition(sin(framecount*0.023)*3, 4, cos(framecount*0.013)*3);
camera.setPosition(sin(framecount * 0.0005) * 20,
sin(framecount * 0.0013) * 5 + 15,
cos(framecount * 0.0005) * 20);
// camera.setPosition(8, 5, 5);
float upmovement[3] = {0, 0.001, 0};
man1->move(upmovement);
man2->move(upmovement);
man1->update();
man2->update();
if (startcounter >= FIGHT) {
if (man1->isAlive()) {
if (keys[player1left])
man1->turn(5);
if (keys[player1right])
man1->turn(-5);
if (keys[player1forward])
man1->walk(0.03);
if (keys[player1backward])
man1->walk(-0.03);
if (keys[player1jump])
man1->jump();
if (keys[player1hit])
man1->hit();
} }
/*if (framecount % 10 == 0){ if (man2->isAlive()) {
float pos[3] = {0, 5, 0}; if (keys[player2left])
float vel[3] = {randomf(2)-1, randomf(2)-1, randomf(2)-1}; man2->turn(5);
createBlood(pos, vel); if (keys[player2right])
}*/ man2->turn(-5);
//arenalight.setPosition(sin(framecount*0.01)*6, 3, cos(framecount*0.01)*4); if (keys[player2forward])
//light2.setPosition(sin(framecount*0.017)*6, 2, cos(framecount*0.027)*5); man2->walk(0.03);
//light3.setPosition(sin(framecount*0.023)*3, 4, cos(framecount*0.013)*3); if (keys[player2backward])
man2->walk(-0.03);
camera.setPosition(sin(framecount*0.0005)*20, sin(framecount*0.0013)*5+15, cos(framecount*0.0005)*20); if (keys[player2jump])
man2->jump();
//camera.setPosition(8, 5, 5); if (keys[player2hit])
man2->hit();
float upmovement[3] = {0, 0.001, 0};
man1->move(upmovement);
man2->move(upmovement);
man1->update();
man2->update();
if (startcounter >= FIGHT){
if (man1->isAlive()){
if (keys[player1left]) man1->turn(5);
if (keys[player1right]) man1->turn(-5);
if (keys[player1forward]) man1->walk(0.03);
if (keys[player1backward]) man1->walk(-0.03);
if (keys[player1jump]) man1->jump();
if (keys[player1hit]) man1->hit();
}
if (man2->isAlive()){
if (keys[player2left]) man2->turn(5);
if (keys[player2right]) man2->turn(-5);
if (keys[player2forward]) man2->walk(0.03);
if (keys[player2backward]) man2->walk(-0.03);
if (keys[player2jump]) man2->jump();
if (keys[player2hit]) man2->hit();
}
} }
}
if (keys[SDLK_ESCAPE]) {
stopGame();
}
if (keys[SDLK_ESCAPE]){ arenaworld->move();
stopGame();
}
arenaworld->move();
} }
void drawDamageMeters(void){ void drawDamageMeters(void) {
enable2D(); enable2D();
glEnable(GL_BLEND);
glPushMatrix();
glTranslatef(0.925, 0.22 - 0.025, 0);
glScalef(0.08 * 3 / 4, 0.08, 0.1);
man1->drawVisuals();
glPopMatrix();
glPushMatrix();
glTranslatef(0.075, 0.22 - 0.025, 0);
glScalef(0.08 * 3 / 4, 0.08, 0.1);
man2->drawVisuals();
glPopMatrix();
glDisable(GL_TEXTURE_2D);
glColor3f(1, 1, 0);
char pointstring[5];
sprintf(pointstring, "%i", points1);
print(0.75, 0.05, pointstring, 0.15);
sprintf(pointstring, "%i", points2);
print(0.15, 0.05, pointstring, 0.15);
disable2D();
}
void drawFight(int framecount) {
glLoadIdentity();
camera.glUpdate();
// float position[3];
// camera.getPosition((float*)position);
// createSkyBox(position[0], position[1], position[2], 50, 20, 50);
createSkyBox(0, 10, 0, 50, 20, 50);
light1.setEnabled(true);
light2.setEnabled(true);
light3.setEnabled(true);
light4.setEnabled(true);
updateLights();
arenaworld->draw();
drawDamageMeters();
flaretexture->enable();
light1.createFlare();
light2.createFlare();
light3.createFlare();
light4.createFlare();
flaretexture->disable();
enable2D();
if (fightfade != -1) {
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(0, 0, 0, fightfade);
glBegin(GL_QUADS);
glVertex2f(0, 0);
glVertex2f(1, 0);
glVertex2f(1, 1);
glVertex2f(0, 1);
glEnd();
}
if (startcounter >= READY && startcounter < FIGHT) {
float size = 0.2 - (startcounter - READY) * 0.0001;
float alpha = 1 - (float)(startcounter - READY) / (FIGHT - READY);
float x = 0.5 - size * 1.5;
float y = 0.5 - size * 0.5;
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(alpha, 0, 0, alpha);
print(x, y, "Ready", size);
}
if (startcounter >= FIGHT && startcounter < FIGHT + 200) {
float size = 0.2 + (startcounter - FIGHT) * 0.0005;
float alpha = 1 - (float)(startcounter - FIGHT) / 200;
float x = 0.5 - size * 1.4;
float y = 0.5 - size * 0.5;
glPushMatrix(); glEnable(GL_BLEND);
glTranslatef(0.925, 0.22-0.025, 0); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glScalef(0.08*3/4, 0.08, 0.1); glColor4f(0, alpha, 0, alpha);
man1->drawVisuals(); print(x, y, "Fight!", size);
glPopMatrix(); }
glPushMatrix(); if (dead) {
glTranslatef(0.075, 0.22-0.025, 0); if (endcounter >= VICTORY && endcounter < VICTORYEND) {
glScalef(0.08*3/4, 0.08, 0.1); float size = 0.18 + (endcounter - VICTORY) * 0.0001;
man2->drawVisuals(); float alpha = (float)(endcounter - VICTORY) / (VICTORYEND - VICTORY);
glPopMatrix(); alpha = 1 - 4 * (alpha - 0.5) * (alpha - 0.5);
alpha = pow(alpha, 0.5);
float x = 0.5 - size * 1.9;
float y = 0.3 - size * 0.5;
glDisable(GL_TEXTURE_2D); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(0, 0, alpha, alpha);
print(x, y, "Victory!", size);
}
}
disable2D();
glColor3f(1, 1, 0); glDisable(GL_BLEND);
glEnable(GL_DEPTH_TEST);
char pointstring[5];
sprintf(pointstring, "%i", points1);
print(0.75, 0.05, pointstring, 0.15);
sprintf(pointstring, "%i", points2);
print(0.15, 0.05, pointstring, 0.15);
disable2D();
}
void drawFight(int framecount){
glLoadIdentity();
camera.glUpdate();
//float position[3];
//camera.getPosition((float*)position);
//createSkyBox(position[0], position[1], position[2], 50, 20, 50);
createSkyBox(0, 10, 0, 50, 20, 50);
light1.setEnabled(true);
light2.setEnabled(true);
light3.setEnabled(true);
light4.setEnabled(true);
updateLights();
arenaworld->draw();
drawDamageMeters();
flaretexture->enable();
light1.createFlare();
light2.createFlare();
light3.createFlare();
light4.createFlare();
flaretexture->disable();
enable2D();
if (fightfade != -1){
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(0, 0, 0, fightfade);
glBegin(GL_QUADS);
glVertex2f(0, 0);
glVertex2f(1, 0);
glVertex2f(1, 1);
glVertex2f(0, 1);
glEnd();
}
if (startcounter >= READY && startcounter < FIGHT){
float size = 0.2 - (startcounter - READY)*0.0001;
float alpha = 1 - (float)(startcounter - READY)/(FIGHT - READY);
float x = 0.5 - size*1.5;
float y = 0.5 - size*0.5;
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(alpha, 0, 0, alpha);
print(x, y, "Ready", size);
}
if (startcounter >= FIGHT && startcounter < FIGHT+200){
float size = 0.2 + (startcounter - FIGHT)*0.0005;
float alpha = 1 - (float)(startcounter - FIGHT)/200;
float x = 0.5 - size*1.4;
float y = 0.5 - size*0.5;
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(0, alpha, 0, alpha);
print(x, y, "Fight!", size);
}
if (dead){
if (endcounter >= VICTORY && endcounter < VICTORYEND){
float size = 0.18 + (endcounter - VICTORY)*0.0001;
float alpha = (float)(endcounter - VICTORY)/(VICTORYEND-VICTORY);
alpha = 1-4*(alpha-0.5)*(alpha-0.5);
alpha = pow(alpha, 0.5);
float x = 0.5 - size*1.9;
float y = 0.3 - size*0.5;
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(0, 0, alpha, alpha);
print(x, y, "Victory!", size);
}
}
disable2D();
glDisable(GL_BLEND);
glEnable(GL_DEPTH_TEST);
} }

1
src/fight.h
View file

@ -25,4 +25,3 @@ void handleKeydownFight(SDLKey key);
void addGraphicsVector(float *p1, float *p2, float size); void addGraphicsVector(float *p1, float *p2, float size);
#endif #endif

103
src/font.cpp
View file

@ -5,69 +5,70 @@
Texture *fonttexture; Texture *fonttexture;
void drawChar(float x, float y, char ch, float size){ void drawChar(float x, float y, char ch, float size) {
fonttexture->enable(); fonttexture->enable();
int tx = (ch&15)*64; int tx = (ch & 15) * 64;
int ty = (ch>>4)*64; int ty = (ch >> 4) * 64;
float w = size, h = size*4/3; float w = size, h = size * 4 / 3;
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
glBegin(GL_QUADS); glBegin(GL_QUADS);
glTexCoord2f((tx)/1024.0, (ty)/1024.0); glTexCoord2f((tx) / 1024.0, (ty) / 1024.0);
glVertex2f(x, y); glVertex2f(x, y);
glTexCoord2f((tx)/1024.0, (ty+64)/1024.0); glTexCoord2f((tx) / 1024.0, (ty + 64) / 1024.0);
glVertex2f(x, y+h); glVertex2f(x, y + h);
glTexCoord2f((tx+64)/1024.0, (ty+64)/1024.0); glTexCoord2f((tx + 64) / 1024.0, (ty + 64) / 1024.0);
glVertex2f(x+w, y+h); glVertex2f(x + w, y + h);
glTexCoord2f((tx+64)/1024.0, (ty)/1024.0); glTexCoord2f((tx + 64) / 1024.0, (ty) / 1024.0);
glVertex2f(x+w, y); glVertex2f(x + w, y);
glEnd(); glEnd();
fonttexture->disable(); fonttexture->disable();
} }
float letterwidth[256] = { float letterwidth[256] = {
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
0.5, 0.2, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.45, 0.2, 0.5, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.5, 0.2, 1.0, 1.0, 1.0, 1.0, 1.0,
0.6, 0.5, 0.6, 0.6, 0.65, 0.65, 0.6, 0.65, 0.6, 0.6, 0.2, 1.0, 1.0, 1.0, 1.0, 0.5, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.45, 0.2, 0.5, 0.6, 0.5, 0.6, 0.6,
1.0, 0.7, 0.6, 0.7, 0.7, 0.65, 0.6, 0.7, 0.8, 0.6, 0.7, 0.7, 0.6, 0.9, 0.85, 0.8, 0.65, 0.65, 0.6, 0.65, 0.6, 0.6, 0.2, 1.0, 1.0, 1.0, 1.0, 0.5, 1.0,
0.6, 0.9, 0.7, 0.7, 0.7, 0.7, 0.7, 1.0, 0.8, 0.7, 0.8, 1.0, 1.0, 1.0, 1.0, 1.0, 0.7, 0.6, 0.7, 0.7, 0.65, 0.6, 0.7, 0.8, 0.6, 0.7, 0.7, 0.6, 0.9,
1.0, 0.6, 0.6, 0.6, 0.6, 0.6, 0.5, 0.6, 0.6, 0.2, 0.4, 0.6, 0.2, 0.8, 0.5, 0.55, 0.85, 0.8, 0.6, 0.9, 0.7, 0.7, 0.7, 0.7, 0.7, 1.0, 0.8, 0.7, 0.8,
0.55, 0.55, 0.5, 0.55, 0.55, 0.55, 0.6, 0.8, 0.6, 0.6, 0.6, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.6, 0.6, 0.6, 0.6, 0.6, 0.5, 0.6,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.6, 0.2, 0.4, 0.6, 0.2, 0.8, 0.5, 0.55, 0.55, 0.55, 0.5, 0.55, 0.55,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.55, 0.6, 0.8, 0.6, 0.6, 0.6, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
}; 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0};
void print(float x, float y, char *text, float size){ void print(float x, float y, char *text, float size) {
int i; int i;
int textlength = strlen(text); int textlength = strlen(text);
float px = x; float px = x;
float py = y; float py = y;
for (i = 0; i < textlength; i++){ for (i = 0; i < textlength; i++) {
char ch = text[i]; char ch = text[i];
if (ch == '\n'){ if (ch == '\n') {
px = x; px = x;
py += size*1.2; py += size * 1.2;
} else{ } else {
drawChar(px, py, ch, size); drawChar(px, py, ch, size);
px += size*letterwidth[ch]; px += size * letterwidth[ch];
}
} }
}
} }

3
src/font.h
View file

@ -5,9 +5,8 @@
extern Texture *fonttexture; extern Texture *fonttexture;
//Top left = 0.0 , 0.0 Bottom right = 1.0 , 1.0 // Top left = 0.0 , 0.0 Bottom right = 1.0 , 1.0
void drawChar(float x, float y, char ch, float size = 0.05); void drawChar(float x, float y, char ch, float size = 0.05);
void print(float x, float y, char *text, float size = 0.05); void print(float x, float y, char *text, float size = 0.05);
#endif #endif

58
src/glapi.cpp
View file

@ -2,63 +2,61 @@
#include "glapi.h" #include "glapi.h"
void setupOpengl(int width, int height){ void setupOpengl(int width, int height) {
//float ratio = (float)width/height; // float ratio = (float)width/height;
float ratio = 4.0/3.0; float ratio = 4.0 / 3.0;
glShadeModel(GL_SMOOTH); glShadeModel(GL_SMOOTH);
glCullFace(GL_BACK); glCullFace(GL_BACK);
glFrontFace(GL_CCW); glFrontFace(GL_CCW);
glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LEQUAL); glDepthFunc(GL_LEQUAL);
glClearDepth(1.0); glClearDepth(1.0);
glClearColor(0, 0, 0, 0); glClearColor(0, 0, 0, 0);
glEnable(GL_COLOR_MATERIAL); glEnable(GL_COLOR_MATERIAL);
//Enables lighting with zero initial lights. Lights are created with Light-class // Enables lighting with zero initial lights. Lights are created with
glEnable(GL_LIGHTING); // Light-class
glDisable(GL_LIGHT0); glEnable(GL_LIGHTING);
glDisable(GL_LIGHT0);
float ambient[4]= {0.1, 0.1, 0.1, 1}; float ambient[4] = {0.1, 0.1, 0.1, 1};
glLightModelfv(GL_LIGHT_MODEL_AMBIENT, ambient); glLightModelfv(GL_LIGHT_MODEL_AMBIENT, ambient);
glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE); glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);
glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_FALSE); glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_FALSE);
GLfloat zero[4] = {0, 0, 0, 1}; GLfloat zero[4] = {0, 0, 0, 1};
GLfloat one[4] = {1, 1, 1, 1}; GLfloat one[4] = {1, 1, 1, 1};
//Default frontface lighting // Default frontface lighting
glMaterialfv(GL_FRONT, GL_AMBIENT, one); glMaterialfv(GL_FRONT, GL_AMBIENT, one);
glMaterialfv(GL_FRONT, GL_DIFFUSE, one); glMaterialfv(GL_FRONT, GL_DIFFUSE, one);
GLfloat specular[4] = {2, 2, 2, 1}; GLfloat specular[4] = {2, 2, 2, 1};
glMaterialfv(GL_FRONT, GL_SPECULAR, specular); glMaterialfv(GL_FRONT, GL_SPECULAR, specular);
glMaterialf(GL_FRONT, GL_SHININESS, 120); glMaterialf(GL_FRONT, GL_SHININESS, 120);
//Never any backface lighting, except ambient // Never any backface lighting, except ambient
glMaterialfv(GL_BACK, GL_AMBIENT, one); glMaterialfv(GL_BACK, GL_AMBIENT, one);
glMaterialfv(GL_BACK, GL_DIFFUSE, zero); glMaterialfv(GL_BACK, GL_DIFFUSE, zero);
glMaterialfv(GL_BACK, GL_SPECULAR, zero); glMaterialfv(GL_BACK, GL_SPECULAR, zero);
glViewport(0, 0, width, height);
glDepthFunc(GL_LEQUAL);
glViewport(0, 0, width, height);
glDepthFunc(GL_LEQUAL);
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
glEnable(GL_NORMALIZE); glEnable(GL_NORMALIZE);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
gluPerspective(60.0, ratio, 1.0, 1024.0); gluPerspective(60.0, ratio, 1.0, 1024.0);
// glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
//glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
} }

2
src/glapi.h
View file

@ -6,5 +6,3 @@
void setupOpengl(int width, int height); void setupOpengl(int width, int height);
#endif #endif

274
src/graphics.cpp
View file

@ -3,26 +3,23 @@
GraphicsDruid *GraphicsDruid::instance = 0; GraphicsDruid *GraphicsDruid::instance = 0;
GraphicsDruid::GraphicsDruid(void){ GraphicsDruid::GraphicsDruid(void) { this->reserved = 0; }
this->reserved = 0;
}
GraphicsDruid::~GraphicsDruid(void){ GraphicsDruid::~GraphicsDruid(void) {}
}
void GraphicsDruid::init(void){ void GraphicsDruid::init(void) {
instance->textureCount = 0; instance->textureCount = 0;
instance->reserved = ID_ARRAY_INIT_SIZE; instance->reserved = ID_ARRAY_INIT_SIZE;
instance->idArray = (int*) calloc(ID_ARRAY_INIT_SIZE, sizeof(int)); instance->idArray = (int *)calloc(ID_ARRAY_INIT_SIZE, sizeof(int));
for (int i=0; i < instance->reserved; i++){ for (int i = 0; i < instance->reserved; i++) {
instance->idArray[i] = -1; instance->idArray[i] = -1;
} }
} }
void GraphicsDruid::destroy(void){ void GraphicsDruid::destroy(void) {
if (instance->textureCount > 0){ if (instance->textureCount > 0) {
glDeleteTextures(GL_TEXTURE_2D, (const unsigned int*)instance->idArray); glDeleteTextures(GL_TEXTURE_2D, (const unsigned int *)instance->idArray);
} }
free(instance->idArray); free(instance->idArray);
instance->idArray = 0; instance->idArray = 0;
@ -30,35 +27,37 @@ void GraphicsDruid::destroy(void){
instance = 0; instance = 0;
} }
GraphicsDruid &GraphicsDruid::getInstance(void){ GraphicsDruid &GraphicsDruid::getInstance(void) {
if (!instance){ if (!instance) {
instance = new GraphicsDruid; instance = new GraphicsDruid;
init(); init();
} }
return *instance; return *instance;
} }
int GraphicsDruid::loadTexture(SDL_Surface *texture, int id, int format){ int GraphicsDruid::loadTexture(SDL_Surface *texture, int id, int format) {
int textureID = id == -1 ? getNewTextureID(id) : id; int textureID = id == -1 ? getNewTextureID(id) : id;
// register texture in OpenGL // register texture in OpenGL
glBindTexture (GL_TEXTURE_2D, textureID); glBindTexture(GL_TEXTURE_2D, textureID);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);//_MIPMAP_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
//glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); GL_LINEAR); //_MIPMAP_NEAREST);
//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); // glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
//printf("w: %i, h: %i, format: %i, RGBA: %i, pixels: %p\n", // printf("w: %i, h: %i, format: %i, RGBA: %i, pixels: %p\n",
// texture->w, texture->h, format, GL_RGBA, texture->pixels); // texture->w, texture->h, format, GL_RGBA, texture->pixels);
//printf("Pitch: %i, Bpp: %i\n", texture->pitch, texture->format->BytesPerPixel); // printf("Pitch: %i, Bpp: %i\n", texture->pitch,
// texture->format->BytesPerPixel);
/*gluBuild2DMipmaps(GL_TEXTURE_2D, /*gluBuild2DMipmaps(GL_TEXTURE_2D,
4, 4,
@ -67,170 +66,171 @@ int GraphicsDruid::loadTexture(SDL_Surface *texture, int id, int format){
format, format,
GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE,
texture->pixels);*/ texture->pixels);*/
int w = texture->w; int w = texture->w;
int h = texture->h; int h = texture->h;
/*int i; /*int i;
while (w > 0){ while (w > 0){
w >>= 1; w >>= 1;
i++; i++;
} }
w = 1; w = 1;
for (;i > 1; i--) w <<= 1; for (;i > 1; i--) w <<= 1;
while (h > 0){ while (h > 0){
h >>= 1; h >>= 1;
i++; i++;
} }
h = 1; h = 1;
for (;i > 1; i--) h <<= 1;*/ for (;i > 1; i--) h <<= 1;*/
//glTexImage2D(GL_TEXTURE_2D, 0, texture->format->BytesPerPixel, w, h, 0, format, GL_UNSIGNED_BYTE, texture->pixels); // glTexImage2D(GL_TEXTURE_2D, 0, texture->format->BytesPerPixel, w, h, 0,
if (texture->format->BytesPerPixel == 3){ // format, GL_UNSIGNED_BYTE, texture->pixels);
glTexImage2D(GL_TEXTURE_2D, 0, 3, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, texture->pixels); if (texture->format->BytesPerPixel == 3) {
} else if (texture->format->BytesPerPixel == 4){ glTexImage2D(GL_TEXTURE_2D, 0, 3, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE,
glTexImage2D(GL_TEXTURE_2D, 0, 4, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture->pixels); texture->pixels);
} } else if (texture->format->BytesPerPixel == 4) {
//SDL_FreeSurface(texture); glTexImage2D(GL_TEXTURE_2D, 0, 4, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE,
//SDL_FreeSurface(alphaSurface); texture->pixels);
}
// SDL_FreeSurface(texture);
// SDL_FreeSurface(alphaSurface);
return textureID; return textureID;
} }
int GraphicsDruid::loadTexture(char* path, int id){ int GraphicsDruid::loadTexture(char *path, int id) {
SDL_Surface* texture; SDL_Surface *texture;
texture = IMG_Load(path); texture = IMG_Load(path);
if (!texture){ if (!texture) {
#ifdef _DEBUG #ifdef _DEBUG
printf ("Error while loading image: %s\n", SDL_GetError()); printf("Error while loading image: %s\n", SDL_GetError());
#endif #endif
return -1; return -1;
} }
int textureID = getNewTextureID(id); int textureID = getNewTextureID(id);
// register texture in OpenGL
glBindTexture(GL_TEXTURE_2D, textureID);
// register texture in OpenGL // glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
glBindTexture (GL_TEXTURE_2D, textureID);
//glPixelStorei (GL_UNPACK_ALIGNMENT, 1); // NOTE : Making some assumptions about texture parameters
// glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
// glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
// GL_LINEAR_MIPMAP_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
// NOTE : Making some assumptions about texture parameters glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); // printf("w: %i, h: %i, RGBA: %i, pixels: %p\n",
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); // texture->w, texture->h, GL_RGBA, texture->pixels);
glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); // printf("Pitch: %i, Bpp: %i\n", texture->pitch,
// texture->format->BytesPerPixel);
//printf("w: %i, h: %i, RGBA: %i, pixels: %p\n", if (texture->format->BytesPerPixel == 3) {
// texture->w, texture->h, GL_RGBA, texture->pixels);
//printf("Pitch: %i, Bpp: %i\n", texture->pitch, texture->format->BytesPerPixel);
if (texture->format->BytesPerPixel == 3){
/*gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, /*gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB,
texture->w, texture->w,
texture->h, texture->h,
GL_RGB, GL_UNSIGNED_BYTE, GL_RGB, GL_UNSIGNED_BYTE,
texture->pixels);*/ texture->pixels);*/
glTexImage2D(GL_TEXTURE_2D, 0, 3, texture->w, texture->h, 0, GL_RGB, GL_UNSIGNED_BYTE, texture->pixels); glTexImage2D(GL_TEXTURE_2D, 0, 3, texture->w, texture->h, 0, GL_RGB,
} GL_UNSIGNED_BYTE, texture->pixels);
else if (texture->format->BytesPerPixel == 4){ } else if (texture->format->BytesPerPixel == 4) {
/*gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, /*gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA,
texture->w, texture->w,
texture->h, texture->h,
GL_RGBA, GL_UNSIGNED_BYTE, GL_RGBA, GL_UNSIGNED_BYTE,
texture->pixels);*/ texture->pixels);*/
glTexImage2D(GL_TEXTURE_2D, 0, 4, texture->w, texture->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture->pixels); glTexImage2D(GL_TEXTURE_2D, 0, 4, texture->w, texture->h, 0, GL_RGBA,
} GL_UNSIGNED_BYTE, texture->pixels);
}
/* /*
gluBuild2DMipmaps(GL_TEXTURE_2D, gluBuild2DMipmaps(GL_TEXTURE_2D,
0, 0,
texture->w, texture->w,
texture->h, texture->h,
GL_RGBA, GL_RGBA,
GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE,
texture->pixels); texture->pixels);
*/ */
SDL_FreeSurface(texture); SDL_FreeSurface(texture);
return textureID; return textureID;
} }
int GraphicsDruid::loadTranspTexture(char* path, float* transpColor, int id){ int GraphicsDruid::loadTranspTexture(char *path, float *transpColor, int id) {
SDL_Surface* texture; SDL_Surface *texture;
texture = IMG_Load(path); texture = IMG_Load(path);
if (!texture){ if (!texture) {
#ifdef _DEBUG #ifdef _DEBUG
printf ("Error while loading image: %s\n", SDL_GetError()); printf("Error while loading image: %s\n", SDL_GetError());
#endif #endif
return -1; return -1;
} }
Uint32 colorKey =
Uint32 colorKey = SDL_MapRGB(texture->format, SDL_MapRGB(texture->format, (Uint8)(transpColor[0] * 255),
(Uint8)(transpColor[0] * 255), (Uint8)(transpColor[1] * 255), (Uint8)(transpColor[2] * 255));
(Uint8)(transpColor[1] * 255), // SDL_SetAlpha(texture, 0, SDL_ALPHA_OPAQUE);
(Uint8)(transpColor[2] * 255));
//SDL_SetAlpha(texture, 0, SDL_ALPHA_OPAQUE);
SDL_SetColorKey(texture, SDL_SRCCOLORKEY, colorKey); SDL_SetColorKey(texture, SDL_SRCCOLORKEY, colorKey);
//SDL_Surface* alphaSurface = SDL_DisplayFormatAlpha(texture); // SDL_Surface* alphaSurface = SDL_DisplayFormatAlpha(texture);
texture = SDL_DisplayFormatAlpha(texture); texture = SDL_DisplayFormatAlpha(texture);
return loadTexture(texture); return loadTexture(texture);
} }
int GraphicsDruid::getNewTextureID(int id){ int GraphicsDruid::getNewTextureID(int id) {
if (id != -1){ if (id != -1) {
for (int i = 0; i < instance->reserved; i++){ for (int i = 0; i < instance->reserved; i++) {
if (instance->idArray[i] == id){ if (instance->idArray[i] == id) {
freeTexture(id); freeTexture(id);
instance->textureCount--; instance->textureCount--;
break; break;
} }
}
} }
GLuint newId;
if (id == -1){
glGenTextures (1, &newId);
}
else
newId = id;
int index = 0;
while (instance->idArray[index] != -1 && index < instance->reserved){
index++;
} }
// out of space, make more GLuint newId;
if (index >= instance->reserved){
instance->idArray = (int*) realloc(instance->idArray, (instance->reserved + ID_ARRAY_GROW)*sizeof(int));
for (int i = instance->reserved + 1; i < instance->reserved + ID_ARRAY_GROW; i++) if (id == -1) {
instance->idArray[i] = -1; glGenTextures(1, &newId);
} else
newId = id;
instance->reserved += ID_ARRAY_GROW; int index = 0;
} while (instance->idArray[index] != -1 && index < instance->reserved) {
else index++;
instance->idArray[index] = newId; }
// out of space, make more
if (index >= instance->reserved) {
instance->idArray = (int *)realloc(
instance->idArray, (instance->reserved + ID_ARRAY_GROW) * sizeof(int));
instance->textureCount++; for (int i = instance->reserved + 1; i < instance->reserved + ID_ARRAY_GROW;
return newId; i++)
instance->idArray[i] = -1;
instance->reserved += ID_ARRAY_GROW;
} else
instance->idArray[index] = newId;
instance->textureCount++;
return newId;
} }
void GraphicsDruid::freeTexture(int id){ void GraphicsDruid::freeTexture(int id) {
if (id > -1 && id < instance->reserved){ if (id > -1 && id < instance->reserved) {
instance->idArray[id] = -1; instance->idArray[id] = -1;
const unsigned int helpInt = id; const unsigned int helpInt = id;
glDeleteTextures(1, &helpInt); glDeleteTextures(1, &helpInt);
} }
} }

30
src/graphics.h
View file

@ -2,7 +2,7 @@
#define __GRAPHICS_H_INCLUDED__ #define __GRAPHICS_H_INCLUDED__
#ifdef WIN32 #ifdef WIN32
#pragma warning ( disable : 4700 ) #pragma warning(disable : 4700)
#endif #endif
#include "main.h" #include "main.h"
@ -15,20 +15,17 @@ const int ID_ARRAY_GROW = 8;
#define DRUID GraphicsDruid::getInstance() #define DRUID GraphicsDruid::getInstance()
#define DIE_DRUID_DIE GraphicsDruid::destroy() #define DIE_DRUID_DIE GraphicsDruid::destroy()
typedef unsigned char byte; typedef unsigned char byte;
typedef struct jpeg_pixel{ typedef struct jpeg_pixel {
Uint8 red; Uint8 red;
Uint8 green; Uint8 green;
Uint8 blue; Uint8 blue;
}jpeg_pixel; } jpeg_pixel;
class GraphicsDruid {
class GraphicsDruid{
private: private:
static GraphicsDruid *instance;
static GraphicsDruid* instance; int *idArray;
int* idArray;
int textureCount; int textureCount;
int reserved; int reserved;
@ -39,16 +36,13 @@ private:
static void destroy(void); static void destroy(void);
public: public:
static GraphicsDruid &getInstance(void); static GraphicsDruid &getInstance(void);
int loadTexture(SDL_Surface *texture, int id = -1, int format = GL_RGB); int loadTexture(SDL_Surface *texture, int id = -1, int format = GL_RGB);
int loadTexture(char* path, int id = -1); int loadTexture(char *path, int id = -1);
int loadTranspTexture(char* path, float* transpColor, int id = -1); int loadTranspTexture(char *path, float *transpColor, int id = -1);
void freeTexture(int id); void freeTexture(int id);
void freeAll(void); void freeAll(void);
int getNewTextureID(int id); int getNewTextureID(int id);
}; };
#endif #endif

750
src/legoblocks.cpp
View file

@ -9,132 +9,135 @@
#include "vector.h" #include "vector.h"
#include "glapi.h" #include "glapi.h"
BasicBlock::BasicBlock(int width, int height, int depth) : MeshObject(createBox(-width/2.0, width/2.0, -height/2.0*BLOCKHEIGHT, BLOCKHEIGHT*height/2.0, -depth/2.0, depth/2.0)){ BasicBlock::BasicBlock(int width, int height, int depth)
appearance = new BasicBlockAppearance(width, height, depth); : MeshObject(
//geometry = new MeshShape(this); createBox(-width / 2.0, width / 2.0, -height / 2.0 * BLOCKHEIGHT,
BLOCKHEIGHT * height / 2.0, -depth / 2.0, depth / 2.0)) {
appearance = new BasicBlockAppearance(width, height, depth);
// geometry = new MeshShape(this);
} }
void BasicBlock::setColor(float red, float green, float blue){ void BasicBlock::setColor(float red, float green, float blue) {
appearance->getMaterial()->setColor(red, green, blue, 1); appearance->getMaterial()->setColor(red, green, blue, 1);
} }
BasicBlockAppearance::BasicBlockAppearance(int width, int height, int depth) {
this->width = width;
BasicBlockAppearance::BasicBlockAppearance(int width, int height, int depth){ this->height = height;
this->width = width; this->depth = depth;
this->height = height; vectorSet(displacement, 0, 0, 0);
this->depth = depth; gllist = glGenLists(1);
vectorSet(displacement, 0, 0, 0); usematerial = true;
gllist = glGenLists(1);
usematerial = true;
} }
void BasicBlockAppearance::prepare(){ void BasicBlockAppearance::prepare() {
glNewList(gllist, GL_COMPILE); glNewList(gllist, GL_COMPILE);
float width = this->width;
float height = this->height * BLOCKHEIGHT;
float width = this->width; if (usematerial)
float height = this->height * BLOCKHEIGHT; material.enable();
{ // Block
if (usematerial) material.enable(); // Front Face
{//Block
//Front Face
glPushMatrix();
glTranslatef(-width/2.0, -height/2.0, depth/2.0);
drawDetailRectangle(width, height);
glPopMatrix();
// Back Face
glPushMatrix();
glTranslatef(width/2.0, -height/2.0, -depth/2.0);
glRotatef(180, 0, 1, 0);
drawDetailRectangle(width, height);
glPopMatrix();
// Top Face
glPushMatrix();
glTranslatef(-width/2.0, height/2.0, depth/2.0);
glRotatef(-90, 1, 0, 0);
drawDetailRectangle(width, depth);
glPopMatrix();
// Bottom Face
glPushMatrix();
glTranslatef(-width/2.0, -height/2.0, -depth/2.0);
glRotatef(90, 1, 0, 0);
drawDetailRectangle(width, depth);
glPopMatrix();
// Right face
glPushMatrix();
glTranslatef(width/2.0, -height/2.0, depth/2.0);
glRotatef(90, 0, 1, 0);
drawDetailRectangle(depth, height);
glPopMatrix();
// Left Face
glPushMatrix();
glTranslatef(-width/2.0, -height/2.0, -depth/2.0);
glRotatef(-90, 0, 1, 0);
drawDetailRectangle(depth, height);
glPopMatrix();
}
glPushMatrix(); glPushMatrix();
glTranslatef(0.5 - width/2.0, height - height/2.0, 0.5 - depth/2.0); glTranslatef(-width / 2.0, -height / 2.0, depth / 2.0);
int x, z; drawDetailRectangle(width, height);
for (x = 0; x < width; x++){
//glPushMatrix();
for (z = 0; z < depth; z++){
createKnob();
glTranslatef(0, 0, 1);
}
glTranslatef(1, 0, -depth);
//glPopMatrix();
}
glPopMatrix(); glPopMatrix();
if (usematerial) material.disable(); // Back Face
glEndList();
}
void BasicBlockAppearance::draw(){
glPushMatrix(); glPushMatrix();
glTranslatef(displacement[0], displacement[1], displacement[2]); glTranslatef(width / 2.0, -height / 2.0, -depth / 2.0);
glCallList(gllist); glRotatef(180, 0, 1, 0);
drawDetailRectangle(width, height);
glPopMatrix(); glPopMatrix();
//prepare();
// Top Face
glPushMatrix();
glTranslatef(-width / 2.0, height / 2.0, depth / 2.0);
glRotatef(-90, 1, 0, 0);
drawDetailRectangle(width, depth);
glPopMatrix();
// Bottom Face
glPushMatrix();
glTranslatef(-width / 2.0, -height / 2.0, -depth / 2.0);
glRotatef(90, 1, 0, 0);
drawDetailRectangle(width, depth);
glPopMatrix();
// Right face
glPushMatrix();
glTranslatef(width / 2.0, -height / 2.0, depth / 2.0);
glRotatef(90, 0, 1, 0);
drawDetailRectangle(depth, height);
glPopMatrix();
// Left Face
glPushMatrix();
glTranslatef(-width / 2.0, -height / 2.0, -depth / 2.0);
glRotatef(-90, 0, 1, 0);
drawDetailRectangle(depth, height);
glPopMatrix();
}
glPushMatrix();
glTranslatef(0.5 - width / 2.0, height - height / 2.0, 0.5 - depth / 2.0);
int x, z;
for (x = 0; x < width; x++) {
// glPushMatrix();
for (z = 0; z < depth; z++) {
createKnob();
glTranslatef(0, 0, 1);
}
glTranslatef(1, 0, -depth);
// glPopMatrix();
}
glPopMatrix();
if (usematerial)
material.disable();
glEndList();
} }
void BasicBlockAppearance::draw() {
glPushMatrix();
glTranslatef(displacement[0], displacement[1], displacement[2]);
glCallList(gllist);
glPopMatrix();
// prepare();
}
#define BLOCKDETAILGRID 1 #define BLOCKDETAILGRID 1
void drawDetailRectangle(float width, float height){ void drawDetailRectangle(float width, float height) {
glBegin(GL_QUADS); glBegin(GL_QUADS);
float x, y, x2, y2; float x, y, x2, y2;
glNormal3f(0, 0, 1); glNormal3f(0, 0, 1);
for (y = 0; y < height; y += BLOCKDETAILGRID){ for (y = 0; y < height; y += BLOCKDETAILGRID) {
y2 = y + BLOCKDETAILGRID; y2 = y + BLOCKDETAILGRID;
if (y2 > height) y2 = height; if (y2 > height)
for (x = 0; x < width; x += BLOCKDETAILGRID){ y2 = height;
x2 = x + BLOCKDETAILGRID; for (x = 0; x < width; x += BLOCKDETAILGRID) {
if (x2 > width) x2 = width; x2 = x + BLOCKDETAILGRID;
if (x2 > width)
x2 = width;
glTexCoord2f(x / width, y / height); glTexCoord2f(x / width, y / height);
glVertex3f(x, y, 0); glVertex3f(x, y, 0);
glTexCoord2f(x2 / width, y / height); glTexCoord2f(x2 / width, y / height);
glVertex3f(x2, y, 0); glVertex3f(x2, y, 0);
glTexCoord2f(x2 / width, y2 / height); glTexCoord2f(x2 / width, y2 / height);
glVertex3f(x2, y2, 0); glVertex3f(x2, y2, 0);
glTexCoord2f(x / width, y2 / height); glTexCoord2f(x / width, y2 / height);
glVertex3f(x, y2, 0); glVertex3f(x, y2, 0);
} }
} }
glEnd(); glEnd();
} }
#define KNOBROUNDNESS 0.03 #define KNOBROUNDNESS 0.03
@ -142,309 +145,330 @@ void drawDetailRectangle(float width, float height){
int knobgllist; int knobgllist;
int knobdetail; int knobdetail;
void renderKnob(int knobsegments){ void renderKnob(int knobsegments) {
point2d knobpoints[4]; point2d knobpoints[4];
knobpoints[0].x = 0.3; knobpoints[0].x = 0.3;
knobpoints[0].y = 0; knobpoints[0].y = 0;
knobpoints[1].x = 0.3; knobpoints[1].x = 0.3;
knobpoints[1].y = BLOCKHEIGHT*0.5 - KNOBROUNDNESS; knobpoints[1].y = BLOCKHEIGHT * 0.5 - KNOBROUNDNESS;
knobpoints[2].x = 0.3 - KNOBROUNDNESS; knobpoints[2].x = 0.3 - KNOBROUNDNESS;
knobpoints[2].y = BLOCKHEIGHT*0.5; knobpoints[2].y = BLOCKHEIGHT * 0.5;
knobpoints[3].x = 0; knobpoints[3].x = 0;
knobpoints[3].y = BLOCKHEIGHT*0.5; knobpoints[3].y = BLOCKHEIGHT * 0.5;
point2d knobderivates[4]; point2d knobderivates[4];
knobderivates[0].x = 0; knobderivates[0].x = 0;
knobderivates[0].y = knobpoints[1].y - knobpoints[0].y; knobderivates[0].y = knobpoints[1].y - knobpoints[0].y;
knobderivates[1].x = 0; knobderivates[1].x = 0;
knobderivates[1].y = knobpoints[2].y - knobpoints[1].y; knobderivates[1].y = knobpoints[2].y - knobpoints[1].y;
knobderivates[2].x = knobpoints[2].x - knobpoints[1].x; knobderivates[2].x = knobpoints[2].x - knobpoints[1].x;
knobderivates[2].y = 0; knobderivates[2].y = 0;
knobderivates[3].x = knobpoints[3].x - knobpoints[2].x; knobderivates[3].x = knobpoints[3].x - knobpoints[2].x;
knobderivates[3].y = 0; knobderivates[3].y = 0;
createLathedSurface(knobpoints, knobderivates, 4, knobsegments, 4); createLathedSurface(knobpoints, knobderivates, 4, knobsegments, 4);
} }
void initKnob(void){ void initKnob(void) {
glNewList(knobgllist, GL_COMPILE); glNewList(knobgllist, GL_COMPILE);
renderKnob(knobdetail); renderKnob(knobdetail);
glEndList(); glEndList();
} }
void createKnob(int knobsegments){ void createKnob(int knobsegments) {
if (knobsegments != -1){ if (knobsegments != -1) {
renderKnob(knobsegments); renderKnob(knobsegments);
return; return;
}
glCallList(knobgllist);
}
float knobroundness = 0.05;
float pillarroundness = 0.03;
HeadAppearance::HeadAppearance(void) { gllist = glGenLists(1); }
void HeadAppearance::prepare(void) {
glNewList(gllist, GL_COMPILE);
glPushMatrix();
glTranslatef(0, -0.5, 0);
point2d headpoints[14];
headpoints[0].x = 0.0;
headpoints[0].y = BLOCKHEIGHT * (0);
headpoints[1].x = 0.4;
headpoints[1].y = BLOCKHEIGHT * (0);
headpoints[2].x = 0.45;
headpoints[2].y = BLOCKHEIGHT * (0.35);
headpoints[3].x = 0.55;
headpoints[3].y = BLOCKHEIGHT * (0.5);
headpoints[4].x = 0.62 * 1.0;
headpoints[4].y = BLOCKHEIGHT * (0.65);
headpoints[5].x = 0.65 * 1.0;
headpoints[5].y = BLOCKHEIGHT * (1);
headpoints[6].x = 0.65 * 1.0;
headpoints[6].y = BLOCKHEIGHT * (1.75);
headpoints[7].x = 0.65 * 1.0;
headpoints[7].y = BLOCKHEIGHT * (2.35);
headpoints[8].x = 0.62 * 1.0;
headpoints[8].y = BLOCKHEIGHT * (2.60);
headpoints[9].x = 0.55 * 1.0;
headpoints[9].y = BLOCKHEIGHT * (2.80);
headpoints[10].x = 0.4;
headpoints[10].y = BLOCKHEIGHT * (2.95);
headpoints[11].x = 0.3;
headpoints[11].y = BLOCKHEIGHT * 3.5 - pillarroundness;
headpoints[12].x = 0.3 - pillarroundness;
headpoints[12].y = BLOCKHEIGHT * 3.5;
headpoints[13].x = 0;
headpoints[13].y = BLOCKHEIGHT * 3.5;
headpoints[11].x = 0;
headpoints[11].y = BLOCKHEIGHT * 3.0;
glColor4f(0.8, 0.8, 0.0, 1.0);
faceTexture->enable();
glBlendFunc(GL_ONE, GL_SRC_ALPHA);
createLathedSurface(headpoints, NULL, 12, 16, 24);
faceTexture->disable();
glTranslatef(0, BLOCKHEIGHT * 3 - 0.05, 0);
createKnob(16);
glPopMatrix();
glEndList();
}
void HeadAppearance::draw(void) { glCallList(gllist); }
FlowerAppearance::FlowerAppearance(int color1, int color2, int color3) {
gllist = glGenLists(1);
this->color1 = color1;
this->color2 = color2;
this->color3 = color3;
}
void FlowerAppearance::prepare(void) {
glNewList(gllist, GL_COMPILE);
glPushMatrix();
int colors[] = {color1, color2, color3};
glColor3f(0.0, 0.6, 0.0);
point2d basepoints[8];
basepoints[0].x = 0.4;
basepoints[0].y = 0;
basepoints[1].x = 0.4;
basepoints[1].y = BLOCKHEIGHT * 1.5 - pillarroundness;
basepoints[2].x = 0.4 - pillarroundness;
basepoints[2].y = BLOCKHEIGHT * 1.5;
basepoints[3].x = 0.3 + pillarroundness;
basepoints[3].y = BLOCKHEIGHT * 1.5;
basepoints[4].x = 0.3;
basepoints[4].y = BLOCKHEIGHT * 1.5 + pillarroundness;
basepoints[5].x = 0.3;
basepoints[5].y = BLOCKHEIGHT * 2.0 - pillarroundness;
basepoints[6].x = 0.3 - pillarroundness;
basepoints[6].y = BLOCKHEIGHT * 2.0;
basepoints[7].x = 0;
basepoints[7].y = BLOCKHEIGHT * 2.0;
point2d basederivates[8];
basederivates[0].x = 0;
basederivates[0].y = basepoints[1].y - basepoints[0].y;
basederivates[1].x = 0;
basederivates[1].y = basepoints[2].y - basepoints[1].y;
basederivates[2].x = basepoints[2].x - basepoints[1].x;
basederivates[2].y = 0;
basederivates[3].x = basepoints[4].x - basepoints[3].x;
basederivates[3].y = 0;
basederivates[4].x = 0;
basederivates[4].y = basepoints[4].y - basepoints[3].y;
basederivates[5].x = 0;
basederivates[5].y = basepoints[6].y - basepoints[5].y;
basederivates[6].x = basepoints[6].x - basepoints[5].x;
basederivates[6].y = 0;
basederivates[7].x = basepoints[7].x - basepoints[6].x;
basederivates[7].y = 0;
createLathedSurface(basepoints, basederivates, 8, 8, 8);
int i, j;
for (i = 0; i < 3; i++) {
glColor3f(0.0, 0.6, 0.0);
glPushMatrix();
glTranslatef(0, BLOCKHEIGHT, 0.4);
glRotatef(20 - 90, 1, 0, 0);
gluCylinder(gluNewQuadric(), 0.1, 0.1, BLOCKHEIGHT * (3 + i * 0.7), 4, 1);
glRotatef(90, 1, 0, 0);
glTranslatef(0, BLOCKHEIGHT * (3 + i * 0.7), 0);
float r, g, b;
switch (colors[i]) {
case FLOWER_RED:
r = 1.0;
g = 0.0;
b = 0.0;
break;
case FLOWER_YELLOW:
r = 1.0;
g = 1.0;
b = 0.0;
break;
case FLOWER_WHITE:
r = 1.0;
g = 1.0;
b = 1.0;
break;
} }
glCallList(knobgllist);
}
glDisable(GL_CULL_FACE);
glColor3f(r, g, b);
createKnob();
float knobroundness=0.05;
float pillarroundness=0.03;
HeadAppearance::HeadAppearance(void){
gllist = glGenLists(1);
}
void HeadAppearance::prepare(void){
glNewList(gllist, GL_COMPILE);
glPushMatrix();
glTranslatef(0, -0.5, 0);
point2d headpoints[14];
headpoints[0].x=0.0; headpoints[0].y=BLOCKHEIGHT*(0);
headpoints[1].x=0.4; headpoints[1].y=BLOCKHEIGHT*(0);
headpoints[2].x=0.45; headpoints[2].y=BLOCKHEIGHT*(0.35);
headpoints[3].x=0.55; headpoints[3].y=BLOCKHEIGHT*(0.5);
headpoints[4].x=0.62*1.0; headpoints[4].y=BLOCKHEIGHT*(0.65);
headpoints[5].x=0.65*1.0; headpoints[5].y=BLOCKHEIGHT*(1);
headpoints[6].x=0.65*1.0; headpoints[6].y=BLOCKHEIGHT*(1.75);
headpoints[7].x=0.65*1.0; headpoints[7].y=BLOCKHEIGHT*(2.35);
headpoints[8].x=0.62*1.0; headpoints[8].y=BLOCKHEIGHT*(2.60);
headpoints[9].x=0.55*1.0; headpoints[9].y=BLOCKHEIGHT*(2.80);
headpoints[10].x=0.4; headpoints[10].y=BLOCKHEIGHT*(2.95);
headpoints[11].x=0.3; headpoints[11].y=BLOCKHEIGHT*3.5-pillarroundness;
headpoints[12].x=0.3-pillarroundness; headpoints[12].y=BLOCKHEIGHT*3.5;
headpoints[13].x=0; headpoints[13].y=BLOCKHEIGHT*3.5;
headpoints[11].x=0; headpoints[11].y=BLOCKHEIGHT*3.0;
glColor4f(0.8,0.8,0.0,1.0);
faceTexture->enable();
glBlendFunc(GL_ONE, GL_SRC_ALPHA);
createLathedSurface(headpoints,NULL,12,16,24);
faceTexture->disable();
glTranslatef(0, BLOCKHEIGHT*3-0.05, 0);
createKnob(16);
glPopMatrix();
glEndList();
}
void HeadAppearance::draw(void){
glCallList(gllist);
}
FlowerAppearance::FlowerAppearance(int color1, int color2, int color3){
gllist = glGenLists(1);
this->color1 = color1;
this->color2 = color2;
this->color3 = color3;
}
void FlowerAppearance::prepare(void){
glNewList(gllist, GL_COMPILE);
glPushMatrix();
int colors[]={color1,color2,color3};
glColor3f(0.0,0.6,0.0);
point2d basepoints[8];
basepoints[0].x=0.4; basepoints[0].y=0;
basepoints[1].x=0.4; basepoints[1].y=BLOCKHEIGHT*1.5-pillarroundness;
basepoints[2].x=0.4-pillarroundness; basepoints[2].y=BLOCKHEIGHT*1.5;
basepoints[3].x=0.3+pillarroundness; basepoints[3].y=BLOCKHEIGHT*1.5;
basepoints[4].x=0.3; basepoints[4].y=BLOCKHEIGHT*1.5+pillarroundness;
basepoints[5].x=0.3; basepoints[5].y=BLOCKHEIGHT*2.0-pillarroundness;
basepoints[6].x=0.3-pillarroundness; basepoints[6].y=BLOCKHEIGHT*2.0;
basepoints[7].x=0; basepoints[7].y=BLOCKHEIGHT*2.0;
point2d basederivates[8];
basederivates[0].x=0; basederivates[0].y=basepoints[1].y-basepoints[0].y;
basederivates[1].x=0; basederivates[1].y=basepoints[2].y-basepoints[1].y;
basederivates[2].x=basepoints[2].x-basepoints[1].x; basederivates[2].y=0;
basederivates[3].x=basepoints[4].x-basepoints[3].x; basederivates[3].y=0;
basederivates[4].x=0; basederivates[4].y=basepoints[4].y-basepoints[3].y;
basederivates[5].x=0; basederivates[5].y=basepoints[6].y-basepoints[5].y;
basederivates[6].x=basepoints[6].x-basepoints[5].x; basederivates[6].y=0;
basederivates[7].x=basepoints[7].x-basepoints[6].x; basederivates[7].y=0;
createLathedSurface(basepoints,basederivates,8,8,8);
int i,j;
for (i=0;i<3;i++){
glColor3f(0.0,0.6,0.0);
glPushMatrix();
glTranslatef(0,BLOCKHEIGHT,0.4);
glRotatef(20-90,1,0,0);
gluCylinder(gluNewQuadric(),0.1,0.1,BLOCKHEIGHT*(3+i*0.7),4,1);
glRotatef(90,1,0,0);
glTranslatef(0,BLOCKHEIGHT*(3+i*0.7),0);
float r,g,b;
switch(colors[i]){
case FLOWER_RED:
r=1.0; g=0.0; b=0.0;
break;
case FLOWER_YELLOW:
r=1.0; g=1.0; b=0.0;
break;
case FLOWER_WHITE:
r=1.0; g=1.0; b=1.0;
break;
}
glDisable(GL_CULL_FACE);
glColor3f(r,g,b);
createKnob();
/* Terälehdet tehdään triangle-fanilla */ /* Terälehdet tehdään triangle-fanilla */
glBegin(GL_TRIANGLE_FAN); glBegin(GL_TRIANGLE_FAN);
glNormal3f(0.0,1.0,0.0); glNormal3f(0.0, 1.0, 0.0);
glVertex3f(0.0,0.0,0.0); glVertex3f(0.0, 0.0, 0.0);
float x,z; float x, z;
for (j=0;j<24;j+=4){ for (j = 0; j < 24; j += 4) {
x=sin((j+0)*2*PI/24)*0.4; x = sin((j + 0) * 2 * PI / 24) * 0.4;
z=cos((j+0)*2*PI/24)*0.4; z = cos((j + 0) * 2 * PI / 24) * 0.4;
glVertex3f(x,0.0,z); glVertex3f(x, 0.0, z);
x=sin((j+1)*2*PI/24)*0.55; x = sin((j + 1) * 2 * PI / 24) * 0.55;
z=cos((j+1)*2*PI/24)*0.55; z = cos((j + 1) * 2 * PI / 24) * 0.55;
glVertex3f(x,0.0,z); glVertex3f(x, 0.0, z);
x=sin((j+2)*2*PI/24)*0.6; x = sin((j + 2) * 2 * PI / 24) * 0.6;
z=cos((j+2)*2*PI/24)*0.6; z = cos((j + 2) * 2 * PI / 24) * 0.6;
glVertex3f(x,0.0,z); glVertex3f(x, 0.0, z);
x=sin((j+3)*2*PI/24)*0.55; x = sin((j + 3) * 2 * PI / 24) * 0.55;
z=cos((j+3)*2*PI/24)*0.55; z = cos((j + 3) * 2 * PI / 24) * 0.55;
glVertex3f(x,0.0,z); glVertex3f(x, 0.0, z);
}
glVertex3f(0,0.0,0.4);
glEnd();
glEnable(GL_CULL_FACE);
glPopMatrix();
glRotatef(120,0,1,0);
} }
glVertex3f(0, 0.0, 0.4);
glEnd();
glEnable(GL_CULL_FACE);
glPopMatrix(); glPopMatrix();
glEndList(); glRotatef(120, 0, 1, 0);
}
glPopMatrix();
glEndList();
} }
void FlowerAppearance::draw(void){ void FlowerAppearance::draw(void) { glCallList(gllist); }
glCallList(gllist);
}
LampAppearance::LampAppearance(void) { gllist = glGenLists(1); }
void LampAppearance::prepare(void) {
glNewList(gllist, GL_COMPILE);
glPushMatrix();
// glTranslatef(0, -1, 0);
LampAppearance::LampAppearance(void){ // glRotatef(180, 1, 0, 0);
gllist = glGenLists(1);
}
void LampAppearance::prepare(void){
glNewList(gllist, GL_COMPILE);
glPushMatrix();
//glTranslatef(0, -1, 0);
//glRotatef(180, 1, 0, 0);
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
point2d lightpoints[11]; point2d lightpoints[11];
lightpoints[0].x=0.4; lightpoints[0].y=BLOCKHEIGHT*(0); lightpoints[0].x = 0.4;
lightpoints[1].x=0.55; lightpoints[1].y=BLOCKHEIGHT*(0); lightpoints[0].y = BLOCKHEIGHT * (0);
lightpoints[2].x=0.62; lightpoints[2].y=BLOCKHEIGHT*(0+0.15); lightpoints[1].x = 0.55;
lightpoints[3].x=0.65; lightpoints[3].y=BLOCKHEIGHT*(0+0.5); lightpoints[1].y = BLOCKHEIGHT * (0);
lightpoints[4].x=0.68; lightpoints[4].y=BLOCKHEIGHT*(0+1.25); lightpoints[2].x = 0.62;
lightpoints[5].x=0.65; lightpoints[5].y=BLOCKHEIGHT*(0+2); lightpoints[2].y = BLOCKHEIGHT * (0 + 0.15);
lightpoints[6].x=0.62; lightpoints[6].y=BLOCKHEIGHT*(0+2.35); lightpoints[3].x = 0.65;
lightpoints[7].x=0.55; lightpoints[7].y=BLOCKHEIGHT*(0+2.5); lightpoints[3].y = BLOCKHEIGHT * (0 + 0.5);
lightpoints[8].x=0.4; lightpoints[8].y=BLOCKHEIGHT*(0+2.5); lightpoints[4].x = 0.68;
lightpoints[9].x=0.4; lightpoints[9].y=BLOCKHEIGHT*(0+3); lightpoints[4].y = BLOCKHEIGHT * (0 + 1.25);
lightpoints[10].x=0.0; lightpoints[10].y=BLOCKHEIGHT*(0+3); lightpoints[5].x = 0.65;
glColor4f(0.8,0.8,0.8,0.5); lightpoints[5].y = BLOCKHEIGHT * (0 + 2);
glEnable(GL_BLEND); lightpoints[6].x = 0.62;
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); lightpoints[6].y = BLOCKHEIGHT * (0 + 2.35);
lightpoints[7].x = 0.55;
lightpoints[7].y = BLOCKHEIGHT * (0 + 2.5);
lightpoints[8].x = 0.4;
lightpoints[8].y = BLOCKHEIGHT * (0 + 2.5);
lightpoints[9].x = 0.4;
lightpoints[9].y = BLOCKHEIGHT * (0 + 3);
lightpoints[10].x = 0.0;
lightpoints[10].y = BLOCKHEIGHT * (0 + 3);
glColor4f(0.8, 0.8, 0.8, 0.5);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
createLathedSurface(lightpoints,NULL,11,8,11); createLathedSurface(lightpoints, NULL, 11, 8, 11);
glEnable(GL_LIGHTING); glEnable(GL_LIGHTING);
/*glColor3f(0.5, 0.5, 0.5); /*glColor3f(0.5, 0.5, 0.5);
glBegin(GL_LINES); glBegin(GL_LINES);
glVertex3f(0, 1, 0); glVertex3f(0, 1, 0);
glVertex3f(0, -100, 0); glVertex3f(0, -100, 0);
glEnd();*/ glEnd();*/
/*float screencoords[3]
getPointCoordinates(0,lighty,0);
/*float screencoords[3] glLoadIdentity();
getPointCoordinates(0,lighty,0); glTranslatef(screencoords.x,screencoords.y,0);
glDisable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE);
glEnable(GL_BLEND);
glLoadIdentity(); glBlendFunc(GL_ONE,GL_ONE);
glTranslatef(screencoords.x,screencoords.y,0); glEnable(GL_TEXTURE_2D);
glDisable(GL_DEPTH_TEST); glBindTexture(GL_TEXTURE_2D,*flaretexture);
glEnable(GL_CULL_FACE);
glEnable(GL_BLEND);
glBlendFunc(GL_ONE,GL_ONE); glMatrixMode(GL_PROJECTION);
glEnable(GL_TEXTURE_2D); glPushMatrix();
glBindTexture(GL_TEXTURE_2D,*flaretexture); glLoadIdentity();
float sizey=8.0/distance*staticlightflarebrightnesses[lightnumber];
float sizex=sizey*height/width;
glMatrixMode(GL_PROJECTION); if (distance>0.5){
glPushMatrix(); glBegin(GL_QUADS);
glLoadIdentity(); glColor3f(staticlightflarebrightnesses[lightnumber],staticlightflarebrightnesses[lightnumber],staticlightflarebrightnesses[lightnumber]);
float sizey=8.0/distance*staticlightflarebrightnesses[lightnumber];
float sizex=sizey*height/width;
if (distance>0.5){ glTexCoord2f(0.0, 0.0);
glBegin(GL_QUADS); glVertex2f(-sizex,sizey);
glColor3f(staticlightflarebrightnesses[lightnumber],staticlightflarebrightnesses[lightnumber],staticlightflarebrightnesses[lightnumber]);
glTexCoord2f(0.0, 0.0); glTexCoord2f(0.0, 1.0);
glVertex2f(-sizex,sizey); glVertex2f(-sizex,-sizey);
glTexCoord2f(0.0, 1.0); glTexCoord2f(1.0, 1.0);
glVertex2f(-sizex,-sizey); glVertex2f( sizex,-sizey);
glTexCoord2f(1.0, 1.0); glTexCoord2f(1.0, 0.0);
glVertex2f( sizex,-sizey); glVertex2f( sizex,sizey);
glEnd();
}
glTexCoord2f(1.0, 0.0); glDisable(GL_TEXTURE_2D);
glVertex2f( sizex,sizey);
glEnd();
}
glDisable(GL_TEXTURE_2D); glDisable(GL_BLEND);
glDisable(GL_BLEND); glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();*/
glPopMatrix(); glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();*/
glEndList();
glPopMatrix();
glEndList();
} }
void LampAppearance::draw(void){ void LampAppearance::draw(void) { glCallList(gllist); }
glCallList(gllist);
}

64
src/legoblocks.h
View file

@ -8,32 +8,31 @@
#define BLOCKHEIGHT 0.4 #define BLOCKHEIGHT 0.4
class BasicBlock : public MeshObject{ class BasicBlock : public MeshObject {
private: private:
int width, height, depth; int width, height, depth;
public: public:
BasicBlock(int width, int height, int depth); BasicBlock(int width, int height, int depth);
void setColor(float red, float green, float blue); void setColor(float red, float green, float blue);
}; };
class BasicBlockAppearance : public Appearance {
class BasicBlockAppearance : public Appearance{
private: private:
int width, height, depth; int width, height, depth;
int gllist; int gllist;
protected: protected:
bool usematerial; bool usematerial;
public: public:
float displacement[3]; float displacement[3];
BasicBlockAppearance(int width, int height, int depth); BasicBlockAppearance(int width, int height, int depth);
virtual void prepare(void); virtual void prepare(void);
virtual void draw(void); virtual void draw(void);
}; };
void drawDetailRectangle(float width, float height); void drawDetailRectangle(float width, float height);
@ -43,49 +42,42 @@ extern int knobdetail;
void initKnob(void); void initKnob(void);
void createKnob(int knobsegments = -1); void createKnob(int knobsegments = -1);
class HeadAppearance : public Appearance {
class HeadAppearance : public Appearance{
private: private:
int gllist; int gllist;
public: public:
HeadAppearance(void); HeadAppearance(void);
void prepare(void); void prepare(void);
void draw(void); void draw(void);
}; };
#define FLOWER_RED 1 #define FLOWER_RED 1
#define FLOWER_YELLOW 2 #define FLOWER_YELLOW 2
#define FLOWER_WHITE 3 #define FLOWER_WHITE 3
class FlowerAppearance : public Appearance{ class FlowerAppearance : public Appearance {
private: private:
int gllist; int gllist;
int color1, color2, color3; int color1, color2, color3;
public: public:
FlowerAppearance(int color1, int color2, int color3); FlowerAppearance(int color1, int color2, int color3);
void prepare(void); void prepare(void);
void draw(void); void draw(void);
}; };
class LampAppearance : public Appearance {
class LampAppearance : public Appearance{
private: private:
int gllist; int gllist;
public: public:
LampAppearance(void); LampAppearance(void);
void prepare(void); void prepare(void);
void draw(void); void draw(void);
}; };
#endif #endif

1736
src/legoman.cpp
View file

File diff suppressed because it is too large Load diff

207
src/legoman.h
View file

@ -23,175 +23,168 @@ class DamageVisual;
#define LEFTHAND 4 #define LEFTHAND 4
#define RIGHTHAND 8 #define RIGHTHAND 8
const char LEFTLEGASC[] = DATAPATH "blockolegscaled.asc";
const char LEFTLEGASC[] = DATAPATH"blockolegscaled.asc"; const char RIGHTLEGASC[] = DATAPATH "blockolegscaled.asc";
const char RIGHTLEGASC[] = DATAPATH"blockolegscaled.asc"; const char WAISTASC[] = DATAPATH "blockowaistscaled.asc";
const char WAISTASC[] = DATAPATH"blockowaistscaled.asc"; const char TORSOASC[] = DATAPATH "blockotorsoscaled.asc";
const char TORSOASC[] = DATAPATH"blockotorsoscaled.asc"; const char LEFTARMASC[] = DATAPATH "leftarm.asc";
const char LEFTARMASC[] = DATAPATH"leftarm.asc"; const char RIGHTARMASC[] = DATAPATH "rightarm.asc";
const char RIGHTARMASC[] = DATAPATH"rightarm.asc"; const char LEFTPALMASC[] = DATAPATH "leftpalm.asc";
const char LEFTPALMASC[] = DATAPATH"leftpalm.asc"; const char RIGHTPALMASC[] = DATAPATH "rightpalm.asc";
const char RIGHTPALMASC[] = DATAPATH"rightpalm.asc";
#define MODELSCALE 0.12 #define MODELSCALE 0.12
#define TORSOSCALE 0.115 #define TORSOSCALE 0.115
class BodyPart : public Object {
class BodyPart : public Object{
private: private:
float energy; float energy;
float strength; float strength;
Legoman *parent; Legoman *parent;
bool attached; bool attached;
int immortal; int immortal;
public: public:
BodyPart(Legoman *parent, float strength); BodyPart(Legoman *parent, float strength);
void move(void); void move(void);
void hitForce(float speed, float *speed2, Object *source); void hitForce(float speed, float *speed2, Object *source);
void makeDamage(float amount); void makeDamage(float amount);
void reset(void); void reset(void);
friend class DamageVisual; friend class DamageVisual;
friend class Legoman; friend class Legoman;
}; };
class Sensor{ class Sensor {
private: private:
float relativeposition[3]; float relativeposition[3];
Object *object; Object *object;
float position[3], oldposition[3]; float position[3], oldposition[3];
float velocity[3], oldvelocity[3]; float velocity[3], oldvelocity[3];
float acceleration[3]; float acceleration[3];
public: public:
Sensor(); Sensor();
void attach(Object *object, float *relativeposition); void attach(Object *object, float *relativeposition);
void attach(Object *object); void attach(Object *object);
void update(void); void update(void);
void getPosition(float *target); void getPosition(float *target);
void getVelocity(float *target); void getVelocity(float *target);
void getAcceleration(float *target); void getAcceleration(float *target);
}; };
class Legoman{ class Legoman {
private: private:
int side; int side;
bool alive; bool alive;
BodyPart *head; BodyPart *head;
BodyPart *torso; BodyPart *torso;
BodyPart *waist; BodyPart *waist;
BodyPart *lefthand, *righthand; BodyPart *lefthand, *righthand;
BodyPart *leftleg, *rightleg; BodyPart *leftleg, *rightleg;
DamageVisual *headvisual; DamageVisual *headvisual;
DamageVisual *torsovisual; DamageVisual *torsovisual;
DamageVisual *lefthandvisual, *righthandvisual; DamageVisual *lefthandvisual, *righthandvisual;
DamageVisual *leftlegvisual, *rightlegvisual; DamageVisual *leftlegvisual, *rightlegvisual;
ObjectLink *leftleglink, *rightleglink; ObjectLink *leftleglink, *rightleglink;
ObjectLink *lefthandlink, *righthandlink; ObjectLink *lefthandlink, *righthandlink;
ObjectLink *lll, *rll; ObjectLink *lll, *rll;
ObjectLink *leftleglinks[3], *rightleglinks[3]; ObjectLink *leftleglinks[3], *rightleglinks[3];
ObjectLink *lefthandlinks[3], *righthandlinks[3]; ObjectLink *lefthandlinks[3], *righthandlinks[3];
ObjectLink *headlinks[3]; ObjectLink *headlinks[3];
objectlist *harmfulobjects; objectlist *harmfulobjects;
Legoman *opponent; Legoman *opponent;
Sensor *headsensor, *torsosensor; Sensor *headsensor, *torsosensor;
int walkphase, walkdelay; int walkphase, walkdelay;
int jumpphase; int jumpphase;
int hitside; int hitside;
bool jumpenabled; bool jumpenabled;
int hitcounter; int hitcounter;
World *world; World *world;
void balance(void); void balance(void);
void updateLegs(void); void updateLegs(void);
bool isStanding(void); bool isStanding(void);
bool isOnGround(void); bool isOnGround(void);
float getInvMass(void); float getInvMass(void);
void fallOff(void); void fallOff(void);
void releasePart(BodyPart *part); void releasePart(BodyPart *part);
void die(void); void die(void);
public: public:
Legoman(int side); Legoman(int side);
void insertToWorld(World *world); void insertToWorld(World *world);
void heal(void); void heal(void);
void addHarmfulObject(Object *object); void addHarmfulObject(Object *object);
bool isHarmfulObject(Object *object); bool isHarmfulObject(Object *object);
void addOpponent(Legoman *opponent); void addOpponent(Legoman *opponent);
//Call once per frame // Call once per frame
void update(void); void update(void);
//Lock both legs at the same time by calling // Lock both legs at the same time by calling
//lockLeg(LEFTLEG | RIGHTLEG); // lockLeg(LEFTLEG | RIGHTLEG);
void lockPart(int part); void lockPart(int part);
void unlockPart(int part); void unlockPart(int part);
//Relative movement // Relative movement
void move(float *movement); void move(float *movement);
void turn(float amount); void turn(float amount);
void walk(float amount); void walk(float amount);
void jump(void); void jump(void);
void hit(void); void hit(void);
bool isAlive(void); bool isAlive(void);
Legoman *getOpponent(void); Legoman *getOpponent(void);
void drawVisuals(); void drawVisuals();
friend class BodyPart; friend class BodyPart;
friend void drawEnd(int framecount); friend void drawEnd(int framecount);
}; };
extern Texture *damageHead; extern Texture *damageHead;
extern Texture *damageTorso; extern Texture *damageTorso;
extern Texture *damageHand; extern Texture *damageHand;
extern Texture *damageLeg; extern Texture *damageLeg;
class DamageVisual {
class DamageVisual{
private: private:
BodyPart *object; BodyPart *object;
float x1, y1, x2, y2; float x1, y1, x2, y2;
float tx1, ty1, tx2, ty2; float tx1, ty1, tx2, ty2;
Texture *texture; Texture *texture;
public: public:
DamageVisual(BodyPart *object, Texture *texture, bool mirror, DamageVisual(BodyPart *object, Texture *texture, bool mirror, float x1,
float x1, float y1, float x2, float y2); float y1, float x2, float y2);
void draw(void); void draw(void);
}; };
#endif #endif

268
src/light.cpp
View file

@ -9,184 +9,184 @@ static int glnextlightnum = 0;
static Light *lights[GL_MAX_LIGHTS]; static Light *lights[GL_MAX_LIGHTS];
Light::Light(void){ Light::Light(void) {
setPosition(0, 0, 0); setPosition(0, 0, 0);
setColor(1, 1, 1); setColor(1, 1, 1);
setSpecular(0, 0, 0); setSpecular(0, 0, 0);
setAttenuation(1, 0, 0); setAttenuation(1, 0, 0);
setEnabled(false); setEnabled(false);
glnum = GL_LIGHT0 + glnextlightnum; glnum = GL_LIGHT0 + glnextlightnum;
lights[glnextlightnum] = this; lights[glnextlightnum] = this;
glnextlightnum++; glnextlightnum++;
} }
void Light::setPosition(float x, float y, float z){ void Light::setPosition(float x, float y, float z) {
position[0] = x; position[0] = x;
position[1] = y; position[1] = y;
position[2] = z; position[2] = z;
position[3] = 1; position[3] = 1;
} }
void Light::setDirection(float x, float y, float z){ void Light::setDirection(float x, float y, float z) {
position[0] = -x; position[0] = -x;
position[1] = -y; position[1] = -y;
position[2] = -z; position[2] = -z;
position[3] = 0; position[3] = 0;
} }
void Light::setColor(float red, float green, float blue){ void Light::setColor(float red, float green, float blue) {
diffuse[0] = red; diffuse[0] = red;
diffuse[1] = green; diffuse[1] = green;
diffuse[2] = blue; diffuse[2] = blue;
diffuse[3] = 1; diffuse[3] = 1;
glLightfv(glnum, GL_DIFFUSE, diffuse); glLightfv(glnum, GL_DIFFUSE, diffuse);
} }
void Light::setSpecular(float red, float green, float blue){ void Light::setSpecular(float red, float green, float blue) {
specular[0] = red; specular[0] = red;
specular[1] = green; specular[1] = green;
specular[2] = blue; specular[2] = blue;
specular[3] = 1; specular[3] = 1;
glLightfv(glnum, GL_SPECULAR, specular); glLightfv(glnum, GL_SPECULAR, specular);
} }
void Light::setAttenuation(float constant, float linear, float quadratic){ void Light::setAttenuation(float constant, float linear, float quadratic) {
attenuation[0] = constant; attenuation[0] = constant;
attenuation[1] = linear; attenuation[1] = linear;
attenuation[2] = quadratic; attenuation[2] = quadratic;
glLightf(glnum, GL_CONSTANT_ATTENUATION, attenuation[0]); glLightf(glnum, GL_CONSTANT_ATTENUATION, attenuation[0]);
glLightf(glnum, GL_LINEAR_ATTENUATION, attenuation[1]); glLightf(glnum, GL_LINEAR_ATTENUATION, attenuation[1]);
glLightf(glnum, GL_QUADRATIC_ATTENUATION, attenuation[2]); glLightf(glnum, GL_QUADRATIC_ATTENUATION, attenuation[2]);
} }
void Light::setEnabled(bool enabled){ void Light::setEnabled(bool enabled) {
this->enabled = enabled; this->enabled = enabled;
if (enabled) glEnable(glnum); if (enabled)
else glDisable(glnum); glEnable(glnum);
else
glDisable(glnum);
} }
void Light::glUpdate(void){ void Light::glUpdate(void) { glLightfv(glnum, GL_POSITION, position); }
glLightfv(glnum, GL_POSITION, position);
}
extern Camera camera; extern Camera camera;
void Light::createFlare(void) {
glPushMatrix();
void Light::createFlare(void){ GLint viewport[4];
glPushMatrix(); glGetIntegerv(GL_VIEWPORT, viewport);
GLint viewport[4]; int width = viewport[2];
glGetIntegerv(GL_VIEWPORT, viewport); int height = viewport[3];
int width = viewport[2]; glTranslatef(position[0], position[1], position[2]);
int height = viewport[3];
glTranslatef(position[0], position[1], position[2]); GLboolean lightingenabled = glIsEnabled(GL_LIGHTING);
GLboolean lightingenabled = glIsEnabled(GL_LIGHTING);
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
/*float cx=cameratarget.x-cameraposition.x; /*float cx=cameratarget.x-cameraposition.x;
float cy=cameratarget.y-cameraposition.y; float cy=cameratarget.y-cameraposition.y;
float cz=cameratarget.z-cameraposition.z; float cz=cameratarget.z-cameraposition.z;
float len=sqrt(cx*cx+cy*cy+cz*cz); float len=sqrt(cx*cx+cy*cy+cz*cz);
cx/=len; cx/=len;
cy/=len; cy/=len;
cz/=len;*/ cz/=len;*/
float dir[3]; float dir[3];
float cameratarget[3], cameraposition[3]; float cameratarget[3], cameraposition[3];
camera.getTarget(cameratarget); camera.getTarget(cameratarget);
camera.getPosition(cameraposition); camera.getPosition(cameraposition);
vectorSub(dir, cameratarget, cameraposition); vectorSub(dir, cameratarget, cameraposition);
vectorNormalize(dir); vectorNormalize(dir);
float dir2[3]; float dir2[3];
vectorSub(dir2, position, cameraposition); vectorSub(dir2, position, cameraposition);
float distance = vectorDot(dir2, dir); float distance = vectorDot(dir2, dir);
/*float xd=(staticlightpositions[lightnumber].x-cameraposition.x)*cx; /*float xd=(staticlightpositions[lightnumber].x-cameraposition.x)*cx;
float yd=(staticlightpositions[lightnumber].y-cameraposition.y)*cy; float yd=(staticlightpositions[lightnumber].y-cameraposition.y)*cy;
float zd=(staticlightpositions[lightnumber].z-cameraposition.z)*cz; float zd=(staticlightpositions[lightnumber].z-cameraposition.z)*cz;
float distance=xd+yd+zd;*/ float distance=xd+yd+zd;*/
float screencoords[3];
/*GLint viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
float screencoords[3]; int width=viewport[2];
/*GLint viewport[4]; int height=viewport[3];*/
glGetIntegerv(GL_VIEWPORT, viewport);
int width=viewport[2]; GLdouble modelviewm[16], projectionm[16];
int height=viewport[3];*/ glGetDoublev(GL_MODELVIEW_MATRIX, modelviewm);
glGetDoublev(GL_PROJECTION_MATRIX, projectionm);
GLdouble modelviewm[16], projectionm[16]; GLdouble wx, wy, wz;
glGetDoublev(GL_MODELVIEW_MATRIX, modelviewm); if (gluProject(0, 0, 0, modelviewm, projectionm, viewport, &wx, &wy, &wz) ==
glGetDoublev(GL_PROJECTION_MATRIX, projectionm); GL_FALSE) {
printf("Failure\n");
}
GLdouble wx,wy,wz; screencoords[0] = (float)(2 * wx - width) / width;
if (gluProject(0, 0, 0, modelviewm, projectionm, viewport, &wx, &wy, &wz) == GL_FALSE){ screencoords[1] = (float)(2 * wy - height) / height;
printf("Failure\n"); screencoords[2] = wz;
}
screencoords[0] = (float)(2*wx-width)/width; // getPointCoordinates(screencoords);
screencoords[1] = (float)(2*wy-height)/height; // point3d screencoords = getPointCoordinates(0, 0, 0);
screencoords[2] = wz;
glLoadIdentity();
glTranslatef(screencoords[0], screencoords[1], 0);
glDisable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE);
glEnable(GL_BLEND);
//getPointCoordinates(screencoords); glBlendFunc(GL_ONE, GL_ONE);
//point3d screencoords = getPointCoordinates(0, 0, 0); // glEnable(GL_TEXTURE_2D);
// glBindTexture(GL_TEXTURE_2D, flaretexture->getId());
glLoadIdentity(); glMatrixMode(GL_PROJECTION);
glTranslatef(screencoords[0], screencoords[1], 0); glPushMatrix();
glDisable(GL_DEPTH_TEST); glLoadIdentity();
glEnable(GL_CULL_FACE); float sizey =
glEnable(GL_BLEND); 6.0 / distance * 1.0; // staticlightflarebrightnesses[lightnumber];
float sizex = sizey * height / width;
glBlendFunc(GL_ONE,GL_ONE); if (distance > 0.5) {
//glEnable(GL_TEXTURE_2D); glBegin(GL_QUADS);
//glBindTexture(GL_TEXTURE_2D, flaretexture->getId()); // glColor3f(staticlightflarebrightnesses[lightnumber],staticlightflarebrightnesses[lightnumber],staticlightflarebrightnesses[lightnumber]);
glColor3fv(diffuse);
glMatrixMode(GL_PROJECTION); glTexCoord2f(0.0, 0.0);
glPushMatrix(); glVertex2f(-sizex, sizey);
glLoadIdentity();
float sizey = 6.0/distance * 1.0;//staticlightflarebrightnesses[lightnumber];
float sizex = sizey * height/width;
if (distance>0.5){ glTexCoord2f(0.0, 1.0);
glBegin(GL_QUADS); glVertex2f(-sizex, -sizey);
//glColor3f(staticlightflarebrightnesses[lightnumber],staticlightflarebrightnesses[lightnumber],staticlightflarebrightnesses[lightnumber]);
glColor3fv(diffuse);
glTexCoord2f(0.0, 0.0); glTexCoord2f(1.0, 1.0);
glVertex2f(-sizex,sizey); glVertex2f(sizex, -sizey);
glTexCoord2f(0.0, 1.0); glTexCoord2f(1.0, 0.0);
glVertex2f(-sizex,-sizey); glVertex2f(sizex, sizey);
glEnd();
}
glTexCoord2f(1.0, 1.0); // glDisable(GL_TEXTURE_2D);
glVertex2f( sizex,-sizey);
glTexCoord2f(1.0, 0.0); glDisable(GL_BLEND);
glVertex2f( sizex,sizey);
glEnd();
}
//glDisable(GL_TEXTURE_2D); glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glDisable(GL_BLEND); if (lightingenabled)
glEnable(GL_LIGHTING);
glEnable(GL_DEPTH_TEST);
glPopMatrix(); glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
if (lightingenabled) glEnable(GL_LIGHTING);
glEnable(GL_DEPTH_TEST);
glPopMatrix();
} }
void updateLights(void){ void updateLights(void) {
int i; int i;
for (i = 0; i < glnextlightnum; i++){ for (i = 0; i < glnextlightnum; i++) {
Light *light = lights[i]; Light *light = lights[i];
light->glUpdate(); light->glUpdate();
} }
} }

35
src/light.h
View file

@ -1,30 +1,29 @@
#ifndef __LIGHT_H_INCLUDED__ #ifndef __LIGHT_H_INCLUDED__
#define __LIGHT_H_INCLUDED__ #define __LIGHT_H_INCLUDED__
class Light{ class Light {
private: private:
float position[4]; float position[4];
float diffuse[4]; float diffuse[4];
float specular[4]; float specular[4];
float attenuation[3]; float attenuation[3];
bool enabled; bool enabled;
int glnum; int glnum;
public: public:
//Creates DISABLED light // Creates DISABLED light
Light(void); Light(void);
void setPosition(float x, float y, float z); void setPosition(float x, float y, float z);
void setDirection(float x, float y, float z); void setDirection(float x, float y, float z);
void setColor(float red, float green, float blue); void setColor(float red, float green, float blue);
void setSpecular(float red, float green, float blue); void setSpecular(float red, float green, float blue);
void setAttenuation(float constant, float linear, float quadratic); void setAttenuation(float constant, float linear, float quadratic);
void setEnabled(bool enabled); void setEnabled(bool enabled);
void glUpdate(void); void glUpdate(void);
void createFlare(void); void createFlare(void);
}; };
void updateLights(void); void updateLights(void);
#endif #endif

199
src/main.cpp
View file

@ -16,130 +16,125 @@
#include "glapi.h" #include "glapi.h"
int screenwidth=1024; int screenwidth = 1024;
int screenheight=768; int screenheight = 768;
int screenbpp; int screenbpp;
void exitProgram(int code){ void exitProgram(int code) {
SDL_Quit(); SDL_Quit();
//uninitAudio(); // uninitAudio();
exit(code); exit(code);
} }
void changeResolution(int width, int height, bool fullscreen){ void changeResolution(int width, int height, bool fullscreen) {
int mode = SDL_OPENGL; int mode = SDL_OPENGL;
if (fullscreen) mode |= SDL_FULLSCREEN; if (fullscreen)
if (!SDL_SetVideoMode(width, height, screenbpp, mode)){ mode |= SDL_FULLSCREEN;
fprintf(stderr,"Couldn't set %i*%i*%i opengl video mode: %s\n",screenwidth,screenheight,screenbpp,SDL_GetError()); if (!SDL_SetVideoMode(width, height, screenbpp, mode)) {
exitProgram(-1); fprintf(stderr, "Couldn't set %i*%i*%i opengl video mode: %s\n",
} screenwidth, screenheight, screenbpp, SDL_GetError());
exitProgram(-1);
}
setupOpengl(width, height); setupOpengl(width, height);
screenwidth = width; screenwidth = width;
screenheight = height; screenheight = height;
if (fullscreen) SDL_ShowCursor(SDL_DISABLE); if (fullscreen)
else SDL_ShowCursor(SDL_ENABLE); SDL_ShowCursor(SDL_DISABLE);
else
SDL_ShowCursor(SDL_ENABLE);
initScenes(); initScenes();
} }
bool keys[SDLK_LAST] = {false}; bool keys[SDLK_LAST] = {false};
void handleKeydown(SDL_keysym *keysym){ void handleKeydown(SDL_keysym *keysym) { keys[keysym->sym] = true; }
keys[keysym->sym] = true;
}
void handleKeyup(SDL_keysym *keysym) { keys[keysym->sym] = false; }
void handleKeyup(SDL_keysym *keysym){ void processEvents(void) {
keys[keysym->sym] = false; SDL_Event event;
} while (SDL_PollEvent(&event)) {
switch (event.type) {
void processEvents(void){ case SDL_KEYDOWN:
SDL_Event event; handleKeydown(&event.key.keysym);
while (SDL_PollEvent(&event)){ break;
switch (event.type){ case SDL_KEYUP:
case SDL_KEYDOWN: handleKeyup(&event.key.keysym);
handleKeydown(&event.key.keysym); break;
break; case SDL_VIDEORESIZE:
case SDL_KEYUP: screenwidth = event.resize.w;
handleKeyup(&event.key.keysym); screenheight = event.resize.h;
break; setupOpengl(screenwidth, screenheight);
case SDL_VIDEORESIZE: break;
screenwidth=event.resize.w; case SDL_QUIT:
screenheight=event.resize.h; exitProgram(0);
setupOpengl(screenwidth,screenheight); break;
break;
case SDL_QUIT:
exitProgram(0);
break;
}
} }
}
} }
int getTime(void){ int getTime(void) {
#ifdef WIN32 #ifdef WIN32
return timeGetTime(); return timeGetTime();
#else #else
return SDL_GetTicks(); return SDL_GetTicks();
#endif #endif
} }
int main(int argc, char *argv[]){ int main(int argc, char *argv[]) {
//printf("Initializing SDL.\n"); // printf("Initializing SDL.\n");
if ((SDL_Init(SDL_INIT_VIDEO)==-1)){ if ((SDL_Init(SDL_INIT_VIDEO) == -1)) {
printf("Could not initialize SDL: %s.\n",SDL_GetError()); printf("Could not initialize SDL: %s.\n", SDL_GetError());
exitProgram(-1); exitProgram(-1);
}
const SDL_VideoInfo *info = SDL_GetVideoInfo();
if (!info) {
printf("Could not get video info with SDL: %s.\n", SDL_GetError());
exitProgram(-1);
}
screenbpp = info->vfmt->BitsPerPixel;
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
atexit(SDL_Quit);
SDL_WM_SetCaption("BlockoFighter 2", NULL);
initAudio();
changeResolution(screenwidth, screenheight, false);
// printf("SDL initialized.\n");
double calculatefps = 200.0;
int framecounter, oldframecounter = 0;
int currenttime;
int framesdrawn = 0;
int skipframes;
int starttime = getTime();
while (1) {
do {
currenttime = getTime() - starttime;
framecounter = calculatefps * currenttime / 1000.0;
} while (oldframecounter == framecounter);
skipframes = framecounter - oldframecounter;
for (; skipframes > 0; skipframes--) {
calculateFrame(++oldframecounter);
} }
// calculateFrame(oldframecounter++);
const SDL_VideoInfo *info=SDL_GetVideoInfo(); processEvents();
if (!info){ drawFrame(framecounter);
printf("Could not get video info with SDL: %s.\n",SDL_GetError()); framesdrawn++;
exitProgram(-1); }
} return 0;
screenbpp=info->vfmt->BitsPerPixel;
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
atexit(SDL_Quit);
SDL_WM_SetCaption("BlockoFighter 2",NULL);
initAudio();
changeResolution(screenwidth, screenheight, false);
//printf("SDL initialized.\n");
double calculatefps = 200.0;
int framecounter, oldframecounter = 0;
int currenttime;
int framesdrawn=0;
int skipframes;
int starttime = getTime();
while (1){
do{
currenttime = getTime()-starttime;
framecounter = calculatefps*currenttime/1000.0;
} while (oldframecounter == framecounter);
skipframes = framecounter - oldframecounter;
for (; skipframes > 0; skipframes--){
calculateFrame(++oldframecounter);
}
//calculateFrame(oldframecounter++);
processEvents();
drawFrame(framecounter);
framesdrawn++;
}
return 0;
} }

11
src/main.h
View file

@ -1,10 +1,11 @@
#ifndef __MAIN_H_INCLUDED__ #ifndef __MAIN_H_INCLUDED__
#define __MAIN_H_INCLUDED__ #define __MAIN_H_INCLUDED__
#ifdef WIN32 #ifdef WIN32
#pragma warning(disable:4244) //Disable: conversion from 'double' to 'double', possible loss of data #pragma warning(disable : 4244) // Disable: conversion from 'double' to
#pragma warning(disable:4305) //Disable: truncation from 'const double' to 'double' // 'double', possible loss of data
#pragma warning( \
disable : 4305) // Disable: truncation from 'const double' to 'double'
#endif #endif
#include <SDL.h> #include <SDL.h>
@ -18,10 +19,10 @@ extern int screenwidth, screenheight;
extern int debugcounter; extern int debugcounter;
#ifdef DEBUG #ifdef DEBUG
#define DP printf("%s: %i (Debug counter: %i)\n",__FILE__,__LINE__,debugcounter++); #define DP \
printf("%s: %i (Debug counter: %i)\n", __FILE__, __LINE__, debugcounter++);
#else #else
#define DP #define DP
#endif #endif
#endif #endif

48
src/material.cpp
View file

@ -4,57 +4,49 @@
#include "glapi.h" #include "glapi.h"
#include "graphics.h" #include "graphics.h"
Material::Material(void){ Material::Material(void) {
setColor(1, 1, 1, 1); setColor(1, 1, 1, 1);
this->texture = new Texture; this->texture = new Texture;
} }
bool Material::loadTexture(char *path){ bool Material::loadTexture(char *path) {
if (!this->texture){ if (!this->texture) {
this->texture = new Texture; this->texture = new Texture;
} }
if (this->texture->loadImage(path)){ if (this->texture->loadImage(path)) {
setColor(1, 1, 1, 1); setColor(1, 1, 1, 1);
return true; return true;
} }
return false; return false;
} }
void Material::freeTexture(void){ void Material::freeTexture(void) { this->texture->~Texture(); }
this->texture->~Texture();
void Material::setColor(float red, float green, float blue, float alpha) {
color[0] = red;
color[1] = green;
color[2] = blue;
color[3] = alpha;
} }
void Material::setColor(float red, float green, float blue, float alpha){ const float *Material::getColor(void) { return color; }
color[0] = red;
color[1] = green;
color[2] = blue;
color[3] = alpha;
}
const float* Material::getColor(void){ void Material::enable(void) {
return color;
}
void Material::enable(void){
enabled = true; enabled = true;
glColor4fv(color); glColor4fv(color);
this->texture->enable(); this->texture->enable();
} }
void Material::disable(void){ void Material::disable(void) {
enabled = false; enabled = false;
this->texture->disable(); this->texture->disable();
} }
bool Material::isEnabled(void){ bool Material::isEnabled(void) { return enabled; }
return enabled;
}
Texture* Material::getTexture(void){ Texture *Material::getTexture(void) { return this->texture; }
return this->texture;
}
void Material::setTexture(Texture* tex){ void Material::setTexture(Texture *tex) {
//this->texture->~Texture; // this->texture->~Texture;
this->texture = tex; this->texture = tex;
} }

22
src/material.h
View file

@ -4,26 +4,24 @@
#include <SDL_image.h> #include <SDL_image.h>
#include "texture.h" #include "texture.h"
class Material{ class Material {
private: private:
Texture* texture; Texture *texture;
float color[4]; float color[4];
bool enabled; bool enabled;
public: public:
Material(void); Material(void);
bool loadTexture(char *path); bool loadTexture(char *path);
void freeTexture(void); void freeTexture(void);
void setColor(float red, float green, float blue, float alpha); void setColor(float red, float green, float blue, float alpha);
const float* getColor(void); const float *getColor(void);
void enable(void); void enable(void);
void disable(void); void disable(void);
bool isEnabled(void); bool isEnabled(void);
Texture* getTexture(void); Texture *getTexture(void);
void setTexture(Texture* tex); void setTexture(Texture *tex);
}; };
#endif #endif

1309
src/menu.cpp
View file

File diff suppressed because it is too large Load diff

1
src/menu.h
View file

@ -16,4 +16,3 @@ void drawMenu(int framecount);
void menuRestart(void); void menuRestart(void);
#endif #endif

578
src/mesh.cpp
View file

@ -10,370 +10,358 @@
#include "glapi.h" #include "glapi.h"
Vertex::Vertex(void){ Vertex::Vertex(void) {
vectorSet(position, 0, 0, 0); vectorSet(position, 0, 0, 0);
vectorSet(normal, 0, 0, 0); vectorSet(normal, 0, 0, 0);
} }
Vertex::Vertex(float x, float y, float z){ Vertex::Vertex(float x, float y, float z) {
vectorSet(position, x, y, z); vectorSet(position, x, y, z);
vectorSet(normal, x, y, z); vectorSet(normal, x, y, z);
vectorNormalize(normal); vectorNormalize(normal);
} }
Vertex::Vertex(float x, float y, float z, float nx, float ny, float nz){ Vertex::Vertex(float x, float y, float z, float nx, float ny, float nz) {
vectorSet(position, x, y, z); vectorSet(position, x, y, z);
vectorSet(normal, nx, ny, nz); vectorSet(normal, nx, ny, nz);
} }
void Vertex::setTexCoords(float u, float v){ void Vertex::setTexCoords(float u, float v) {
this->texcoords[0] = u; this->texcoords[0] = u;
this->texcoords[1] = v; this->texcoords[1] = v;
} }
Polygon::Polygon(void){ Polygon::Polygon(void) {
vertexcount = 0; vertexcount = 0;
edgecount = 0; edgecount = 0;
smooth = false; smooth = false;
realsmooth = false; realsmooth = false;
} }
Mesh::Mesh(void) {
vertexcount = 0;
Mesh::Mesh(void){ polygoncount = 0;
vertexcount = 0; edgecount = 0;
polygoncount = 0;
edgecount = 0;
} }
Mesh::~Mesh(void){ Mesh::~Mesh(void) {
delete [] polygons; delete[] polygons;
delete [] vertices; delete[] vertices;
} }
void Mesh::createPlanes(void){ void Mesh::createPlanes(void) {
int i; int i;
for (i = 0; i < polygoncount; i++){ for (i = 0; i < polygoncount; i++) {
class Polygon *polygon = &this->polygons[i]; class Polygon *polygon = &this->polygons[i];
if (polygon->vertexcount >= 3){ if (polygon->vertexcount >= 3) {
float v1[3], v2[3]; float v1[3], v2[3];
vectorSub(v1, polygon->vertices[1]->position, vectorSub(v1, polygon->vertices[1]->position,
polygon->vertices[0]->position); polygon->vertices[0]->position);
vectorSub(v2, polygon->vertices[2]->position, vectorSub(v2, polygon->vertices[2]->position,
polygon->vertices[0]->position); polygon->vertices[0]->position);
vectorCross(polygon->planenormal, v1, v2); vectorCross(polygon->planenormal, v1, v2);
vectorNormalize(polygon->planenormal); vectorNormalize(polygon->planenormal);
polygon->planedistance = -vectorDot(polygon->vertices[0]->position, polygon->planenormal); polygon->planedistance =
} -vectorDot(polygon->vertices[0]->position, polygon->planenormal);
} }
}
} }
void Mesh::createVertexnormals(void){ void Mesh::createVertexnormals(void) {
int i, j, ii; int i, j, ii;
bool connect; bool connect;
float normal[3]; float normal[3];
for (i = 0; i < vertexcount; i++){ for (i = 0; i < vertexcount; i++) {
bool found = false; bool found = false;
vectorSet(normal, 0, 0, 0); vectorSet(normal, 0, 0, 0);
for (j = 0; j < polygoncount; j++){ for (j = 0; j < polygoncount; j++) {
connect = false; connect = false;
class Polygon *polygon = &polygons[j]; class Polygon *polygon = &polygons[j];
for (ii = 0;ii < polygon->vertexcount; ii++){ for (ii = 0; ii < polygon->vertexcount; ii++) {
if (polygons[j].vertices[ii] == &(vertices[i])){ if (polygons[j].vertices[ii] == &(vertices[i])) {
connect = true; connect = true;
}
}
if (connect){
vectorAdd(normal, polygon->planenormal);
found = true;
}
}
if (found){
vectorNormalize(vertices[i].normal, normal);
} }
}
if (connect) {
vectorAdd(normal, polygon->planenormal);
found = true;
}
} }
for (j = 0; j < polygoncount; j++){ if (found) {
class Polygon *polygon = &polygons[j]; vectorNormalize(vertices[i].normal, normal);
if (!polygon->realsmooth) polygon->smooth = true;
} }
}
for (j = 0; j < polygoncount; j++) {
class Polygon *polygon = &polygons[j];
if (!polygon->realsmooth)
polygon->smooth = true;
}
} }
void Mesh::createEdges(void){ void Mesh::createEdges(void) {
int maxedgecount = 0; int maxedgecount = 0;
int i; int i;
for (i = 0; i < polygoncount; i++){ for (i = 0; i < polygoncount; i++) {
class Polygon *polygon = &polygons[i]; class Polygon *polygon = &polygons[i];
maxedgecount += polygon->vertexcount; maxedgecount += polygon->vertexcount;
} }
edgecount = 0; edgecount = 0;
int j, k; int j, k;
Edge *edges = new Edge[maxedgecount]; Edge *edges = new Edge[maxedgecount];
for (i = 0; i < polygoncount; i++){ for (i = 0; i < polygoncount; i++) {
class Polygon *polygon = &polygons[i]; class Polygon *polygon = &polygons[i];
polygon->edges = new Edge *[polygon->vertexcount]; polygon->edges = new Edge *[polygon->vertexcount];
for (j = 1; j <= polygon->vertexcount; j++){ for (j = 1; j <= polygon->vertexcount; j++) {
Vertex *v1 = polygon->vertices[j-1]; Vertex *v1 = polygon->vertices[j - 1];
Vertex *v2 = polygon->vertices[j%polygon->vertexcount]; Vertex *v2 = polygon->vertices[j % polygon->vertexcount];
bool found = false; bool found = false;
for (k = 0; k < edgecount; k++){ for (k = 0; k < edgecount; k++) {
if (edges[k].v2 == v1 && edges[k].v1 == v2){ if (edges[k].v2 == v1 && edges[k].v1 == v2) {
found = true; found = true;
edges[k].p2 = polygon; edges[k].p2 = polygon;
break; break;
}
}
if (!found){
edges[edgecount].v1 = v1;
edges[edgecount].v2 = v2;
edges[edgecount].p1 = polygon;
edges[edgecount].p2 = NULL;
edgecount++;
}
} }
}
if (!found) {
edges[edgecount].v1 = v1;
edges[edgecount].v2 = v2;
edges[edgecount].p1 = polygon;
edges[edgecount].p2 = NULL;
edgecount++;
}
} }
}
this->edges = new Edge[edgecount]; this->edges = new Edge[edgecount];
//printf("%i\n", edgecount); // printf("%i\n", edgecount);
for (i = 0; i < edgecount; i++){ for (i = 0; i < edgecount; i++) {
this->edges[i].v1 = edges[i].v1; this->edges[i].v1 = edges[i].v1;
this->edges[i].v2 = edges[i].v2; this->edges[i].v2 = edges[i].v2;
this->edges[i].p1 = edges[i].p1; this->edges[i].p1 = edges[i].p1;
this->edges[i].p2 = edges[i].p2; this->edges[i].p2 = edges[i].p2;
class Polygon *p; class Polygon *p;
p = edges[i].p1; p = edges[i].p1;
p->edges[p->edgecount++] = &this->edges[i]; p->edges[p->edgecount++] = &this->edges[i];
p = edges[i].p2; p = edges[i].p2;
p->edges[p->edgecount++] = &this->edges[i]; p->edges[p->edgecount++] = &this->edges[i];
//printf("%p, %p\n", edges[i].p1, edges[i].p2); // printf("%p, %p\n", edges[i].p1, edges[i].p2);
} }
delete[] edges; delete[] edges;
} }
float Mesh::calculateScale(float targetLength, int axis) {
float Mesh::calculateScale(float targetLength, int axis){ float min = 0.0;
float max = 0.0;
float min = 0.0; for (int i = 0; i < this->vertexcount; i++) {
float max = 0.0; if (this->vertices->position[axis] > max) {
max = this->vertices->position[axis];
for (int i=0; i < this->vertexcount; i++){
if (this->vertices->position[axis] > max){
max = this->vertices->position[axis];
}
if (this->vertices->position[axis] < min){
min = this->vertices->position[axis];
}
} }
return fabs(targetLength / (max - min)); if (this->vertices->position[axis] < min) {
min = this->vertices->position[axis];
}
}
return fabs(targetLength / (max - min));
} }
/* ei toimi kunnolla kaikille objekteille (kädet ok, jalat ja torso ei) */ /* ei toimi kunnolla kaikille objekteille (kädet ok, jalat ja torso ei) */
void Mesh::scale(float targetLength, int axis){ void Mesh::scale(float targetLength, int axis) {
float newscale = this->calculateScale(targetLength, axis); float newscale = this->calculateScale(targetLength, axis);
this->scale(newscale); this->scale(newscale);
} }
/* ei toimi kunnolla kaikille objekteille (kädet ok, jalat ja torso ei)*/ /* ei toimi kunnolla kaikille objekteille (kädet ok, jalat ja torso ei)*/
void Mesh::scale(float scale){ void Mesh::scale(float scale) {
for (int i=0; i < this->vertexcount; i++){ for (int i = 0; i < this->vertexcount; i++) {
this->vertices->position[0] *= scale; this->vertices->position[0] *= scale;
this->vertices->position[1] *= scale; this->vertices->position[1] *= scale;
this->vertices->position[2] *= scale; this->vertices->position[2] *= scale;
} }
this->createVertexnormals(); this->createVertexnormals();
this->createPlanes(); this->createPlanes();
} }
MeshObject::MeshObject(Mesh *mesh){ MeshObject::MeshObject(Mesh *mesh) {
this->mesh = mesh; this->mesh = mesh;
this->appearance = new MeshAppearance(mesh); this->appearance = new MeshAppearance(mesh);
this->geometry = new MeshShape(this); this->geometry = new MeshShape(this);
} }
MeshAppearance::MeshAppearance(Mesh *mesh) { this->mesh = mesh; }
void MeshAppearance::draw(void) {
MeshAppearance::MeshAppearance(Mesh *mesh){ // glDisable(GL_CULL_FACE);
this->mesh = mesh;
}
void MeshAppearance::draw(void){
//glDisable(GL_CULL_FACE);
glColor4fv(this->material.getColor()); glColor4fv(this->material.getColor());
this->material.enable(); this->material.enable();
int i, j; int i, j;
for (i = 0; i < mesh->polygoncount; i++){ for (i = 0; i < mesh->polygoncount; i++) {
class Polygon *polygon = &mesh->polygons[i]; class Polygon *polygon = &mesh->polygons[i];
glBegin(GL_TRIANGLE_FAN); glBegin(GL_TRIANGLE_FAN);
if (!polygon->smooth) glNormal3fv(polygon->planenormal); if (!polygon->smooth)
glNormal3fv(polygon->planenormal);
for (j = 0; j < polygon->vertexcount; j++){ for (j = 0; j < polygon->vertexcount; j++) {
Vertex *vertex = polygon->vertices[j]; Vertex *vertex = polygon->vertices[j];
if (polygon->smooth) glNormal3fv(vertex->normal); if (polygon->smooth)
glVertex3fv(vertex->position); glNormal3fv(vertex->normal);
glVertex3fv(vertex->position);
}
glEnd();
}
glDisable(GL_DEPTH);
glDisable(GL_LIGHTING);
glLineWidth(5.0);
glBegin(GL_LINES);
for (i = 0; i < mesh->edgecount; i++){
glColor3f(0, 0, 0);
glVertex3fv(mesh->edges[i].v1->position);
glVertex3fv(mesh->edges[i].v2->position);
} }
glEnd(); glEnd();
glEnable(GL_LIGHTING); }
glEnable(GL_DEPTH);
glDisable(GL_DEPTH);
glDisable(GL_LIGHTING);
glLineWidth(5.0);
glBegin(GL_LINES);
for (i = 0; i < mesh->edgecount; i++) {
glColor3f(0, 0, 0);
glVertex3fv(mesh->edges[i].v1->position);
glVertex3fv(mesh->edges[i].v2->position);
}
glEnd();
glEnable(GL_LIGHTING);
glEnable(GL_DEPTH);
this->material.disable(); this->material.disable();
//glEnable(GL_CULL_FACE); // glEnable(GL_CULL_FACE);
} }
MeshShape::MeshShape(MeshObject *object) : Shape(object) {
mesh = object->mesh;
MeshShape::MeshShape(MeshObject *object) : Shape(object){
mesh = object->mesh;
} }
MeshShape::MeshShape(Object *object, Mesh *mesh) : Shape(object){ MeshShape::MeshShape(Object *object, Mesh *mesh) : Shape(object) {
this->mesh = mesh; this->mesh = mesh;
} }
bool MeshShape::checkCollision(Object *target){ bool MeshShape::checkCollision(Object *target) {
return target->geometry->checkCollisionPeer(this); return target->geometry->checkCollisionPeer(this);
} }
float MeshShape::calculateMomentOfInertia(float *rotationvector){ float MeshShape::calculateMomentOfInertia(float *rotationvector) {
if (vectorDot(rotationvector, rotationvector) < EPSILON) return 0; if (vectorDot(rotationvector, rotationvector) < EPSILON)
int i; return 0;
float j = 0; int i;
for (i = 0; i < mesh->vertexcount; i++){ float j = 0;
float proj[3]; for (i = 0; i < mesh->vertexcount; i++) {
vectorProject(proj, mesh->vertices[i].position, rotationvector); float proj[3];
vectorSub(proj, mesh->vertices[i].position, proj); vectorProject(proj, mesh->vertices[i].position, rotationvector);
//float r = vectorLength(proj); vectorSub(proj, mesh->vertices[i].position, proj);
float r2 = vectorDot(proj, proj); // float r = vectorLength(proj);
j += r2; float r2 = vectorDot(proj, proj);
j += r2;
}
return j / i;
}
bool MeshShape::checkCollisionPeer(SphereShape *target) {
float position[3] = {0, 0, 0};
target->object->transformPoint(position, position);
object->unTransformPoint(position, position);
float normal[3];
float contactpoint[3];
float r = target->getRadius();
if (checkSphereMeshCollision(position, r, mesh, normal, contactpoint)) {
vectorScale(normal, -1);
object->transformVector(normal, normal);
object->transformPoint(contactpoint, contactpoint);
addCollision(object, target->object, normal, contactpoint);
// vectorAdd(contactnormal, normal);
return true;
}
return false;
}
// extern Sound *shotsound;
bool MeshShape::checkCollisionPeer(MeshShape *target) {
float normal[3];
float contactpoint[3];
bool collided = false;
int i;
Mesh *sourcemesh, *targetmesh;
sourcemesh = this->mesh;
targetmesh = target->mesh;
for (i = 0; i < sourcemesh->vertexcount; i++) {
Vertex *vertex = &sourcemesh->vertices[i];
float vertexposition[3];
object->transformPoint(vertexposition, vertex->position);
target->object->unTransformPoint(vertexposition, vertexposition);
if (checkPointMeshCollision(vertexposition, targetmesh, normal,
contactpoint)) {
target->object->transformVector(normal, normal);
target->object->transformPoint(contactpoint, contactpoint);
if (vectorIsZero(contactpoint)) {
vectorSet(contactpoint, 0, 0, 0);
}
addCollision(object, target->object, normal, contactpoint);
collided = true;
} }
return j / i; }
sourcemesh = target->mesh;
targetmesh = this->mesh;
for (i = 0; i < sourcemesh->vertexcount; i++) {
Vertex *vertex = &sourcemesh->vertices[i];
float vertexposition[3];
target->object->transformPoint(vertexposition, vertex->position);
object->unTransformPoint(vertexposition, vertexposition);
if (checkPointMeshCollision(vertexposition, targetmesh, normal,
contactpoint)) {
object->transformVector(normal, normal);
object->transformPoint(contactpoint, contactpoint);
addCollision(target->object, object, normal, contactpoint);
collided = true;
}
}
sourcemesh = this->mesh;
targetmesh = target->mesh;
for (i = 0; i < sourcemesh->edgecount; i++) {
Edge *edge = &sourcemesh->edges[i];
float v1[3], v2[3];
object->transformPoint(v1, edge->v1->position);
target->object->unTransformPoint(v1, v1);
object->transformPoint(v2, edge->v2->position);
target->object->unTransformPoint(v2, v2);
if (checkEdgeMeshCollision(v1, v2, targetmesh, normal, contactpoint)) {
target->object->transformVector(normal, normal);
target->object->transformPoint(contactpoint, contactpoint);
addCollision(object, target->object, normal, contactpoint);
collided = true;
}
}
return collided;
} }
bool MeshShape::checkCollisionPeer(SphereShape *target){
float position[3] = {0, 0, 0};
target->object->transformPoint(position, position);
object->unTransformPoint(position, position);
float normal[3];
float contactpoint[3];
float r = target->getRadius();
if (checkSphereMeshCollision(position, r, mesh, normal, contactpoint)){
vectorScale(normal, -1);
object->transformVector(normal, normal);
object->transformPoint(contactpoint, contactpoint);
addCollision(object, target->object, normal, contactpoint);
//vectorAdd(contactnormal, normal);
return true;
}
return false;
}
//extern Sound *shotsound;
bool MeshShape::checkCollisionPeer(MeshShape *target){
float normal[3];
float contactpoint[3];
bool collided = false;
int i;
Mesh *sourcemesh, *targetmesh;
sourcemesh = this->mesh;
targetmesh = target->mesh;
for (i = 0; i < sourcemesh->vertexcount; i++){
Vertex *vertex = &sourcemesh->vertices[i];
float vertexposition[3];
object->transformPoint(vertexposition, vertex->position);
target->object->unTransformPoint(vertexposition, vertexposition);
if (checkPointMeshCollision(vertexposition, targetmesh, normal, contactpoint)){
target->object->transformVector(normal, normal);
target->object->transformPoint(contactpoint, contactpoint);
if (vectorIsZero(contactpoint)){
vectorSet(contactpoint, 0, 0, 0);
}
addCollision(object, target->object, normal, contactpoint);
collided = true;
}
}
sourcemesh = target->mesh;
targetmesh = this->mesh;
for (i = 0; i < sourcemesh->vertexcount; i++){
Vertex *vertex = &sourcemesh->vertices[i];
float vertexposition[3];
target->object->transformPoint(vertexposition, vertex->position);
object->unTransformPoint(vertexposition, vertexposition);
if (checkPointMeshCollision(vertexposition, targetmesh, normal, contactpoint)){
object->transformVector(normal, normal);
object->transformPoint(contactpoint, contactpoint);
addCollision(target->object, object, normal, contactpoint);
collided = true;
}
}
sourcemesh = this->mesh;
targetmesh = target->mesh;
for (i = 0; i < sourcemesh->edgecount; i++){
Edge *edge = &sourcemesh->edges[i];
float v1[3], v2[3];
object->transformPoint(v1, edge->v1->position);
target->object->unTransformPoint(v1, v1);
object->transformPoint(v2, edge->v2->position);
target->object->unTransformPoint(v2, v2);
if (checkEdgeMeshCollision(v1, v2, targetmesh, normal, contactpoint)){
target->object->transformVector(normal, normal);
target->object->transformPoint(contactpoint, contactpoint);
addCollision(object, target->object, normal, contactpoint);
collided = true;
}
}
return collided;
}

119
src/mesh.h
View file

@ -3,119 +3,104 @@
#include "object.h" #include "object.h"
#define X_AXIS 0 #define X_AXIS 0
#define Y_AXIS 1 #define Y_AXIS 1
#define Z_AXIS 2 #define Z_AXIS 2
class Vertex {
class Vertex{
public: public:
float position[3]; float position[3];
float oldposition[3]; float oldposition[3];
float normal[3]; float normal[3];
float texcoords[2]; float texcoords[2];
Vertex(void); Vertex(void);
Vertex(float x, float y, float z); Vertex(float x, float y, float z);
Vertex(float x, float y, float z, float nx, float ny, float nz); Vertex(float x, float y, float z, float nx, float ny, float nz);
void setTexCoords(float u, float v); void setTexCoords(float u, float v);
}; };
class Edge; class Edge;
class Polygon{ class Polygon {
public: public:
float planenormal[3]; float planenormal[3];
float planedistance; float planedistance;
bool smooth; bool smooth;
bool realsmooth; bool realsmooth;
int vertexcount; int vertexcount;
Vertex **vertices; Vertex **vertices;
int edgecount; int edgecount;
Edge **edges; Edge **edges;
Polygon(void); Polygon(void);
}; };
class Edge {
class Edge{
public: public:
Vertex *v1, *v2; Vertex *v1, *v2;
class Polygon *p1, *p2; class Polygon *p1, *p2;
}; };
class Mesh {
class Mesh{
public: public:
int vertexcount; int vertexcount;
Vertex *vertices; Vertex *vertices;
int polygoncount; int polygoncount;
class Polygon *polygons; class Polygon *polygons;
Edge *edges; Edge *edges;
int edgecount; int edgecount;
Mesh(void);
~Mesh(void);
Mesh(void); void createPlanes(void);
~Mesh(void); void createVertexnormals(void);
void createEdges(void);
void createPlanes(void); float calculateScale(float targetLength, int axis);
void createVertexnormals(void); void scale(float targetLength, int axis);
void createEdges(void);
float calculateScale(float targetLength, int axis);
void scale(float targetLength, int axis);
void scale(float scale); void scale(float scale);
}; };
class MeshObject : public Object {
class MeshObject : public Object{
public: public:
Mesh *mesh; Mesh *mesh;
MeshObject(Mesh *mesh); MeshObject(Mesh *mesh);
}; };
class MeshAppearance : public Appearance {
class MeshAppearance : public Appearance{
private: private:
Mesh *mesh; Mesh *mesh;
public: public:
MeshAppearance(Mesh *mesh); MeshAppearance(Mesh *mesh);
void draw(void); void draw(void);
}; };
// Geometry of sphere
class MeshShape : public Shape {
//Geometry of sphere
class MeshShape : public Shape{
private: private:
Mesh *mesh; Mesh *mesh;
public: public:
MeshShape(MeshObject *meshobject); MeshShape(MeshObject *meshobject);
MeshShape(Object *object, Mesh *mesh); MeshShape(Object *object, Mesh *mesh);
float calculateMomentOfInertia(float *rotationvector); float calculateMomentOfInertia(float *rotationvector);
bool checkCollision(Object *target); bool checkCollision(Object *target);
bool checkCollisionPeer(SphereShape *target); bool checkCollisionPeer(SphereShape *target);
bool checkCollisionPeer(MeshShape *target); bool checkCollisionPeer(MeshShape *target);
friend class SphereShape; friend class SphereShape;
}; };
#endif #endif

310
src/object.cpp
View file

@ -9,205 +9,203 @@
#include "fight.h" #include "fight.h"
#include "glapi.h" #include "glapi.h"
Object::Object(void){ Object::Object(void) {
appearance = NULL; appearance = NULL;
geometry = NULL; geometry = NULL;
invmass = 0.0; invmass = 0.0;
setPosition(0, 0, 0); setPosition(0, 0, 0);
vectorSet(momentum, 0, 0, 0); vectorSet(momentum, 0, 0, 0);
invmomentofinertia = 0.0; invmomentofinertia = 0.0;
matrixIdentity(rotation); matrixIdentity(rotation);
vectorSet(angularmomentum, 0, 0, 0); vectorSet(angularmomentum, 0, 0, 0);
setCollisionGroup(COLLISIONGROUP_NONE); setCollisionGroup(COLLISIONGROUP_NONE);
gravity = false; gravity = false;
} }
void Object::prepare(void){ void Object::prepare(void) {
if (appearance != NULL) appearance->prepare(); if (appearance != NULL)
appearance->prepare();
} }
#define DT 0.01 #define DT 0.01
void Object::move(void){ void Object::move(void) { moveStep(DT); }
moveStep(DT);
void Object::moveStep(float dt) {
if (invmass == 0)
return;
if (vectorDot(momentum, momentum) > 1.0e+5)
vectorSet(momentum, 0, 0, 0);
if (vectorDot(angularmomentum, angularmomentum) > 1.0e+5)
vectorSet(angularmomentum, 0, 0, 0);
calculateStateVariables();
float velocitydt[3];
vectorScale(velocitydt, velocity, dt);
vectorAdd(position, velocitydt);
float rotationdt[9];
if (vectorIsZero(angularmomentum)) {
matrixIdentity(rotationdt);
} else {
float angularvelocitydt[3];
vectorScale(angularvelocitydt, angularvelocity, dt);
matrixCreateRotation(rotationdt, angularvelocitydt);
}
matrixMultiply(rotation, rotation, rotationdt);
vectorScale(angularmomentum, 0.99);
} }
void Object::moveStep(float dt){ void Object::calculateStateVariables(void) {
if (invmass == 0) return; getVelocity(velocity);
if (vectorIsZero(angularmomentum)) {
invmomentofinertia = 0;
} else {
invmomentofinertia =
invmass * 1.0 / geometry->calculateMomentOfInertia(angularmomentum);
}
if (vectorDot(momentum, momentum) > 1.0e+5) vectorSet(momentum, 0, 0, 0); vectorScale(angularvelocity, angularmomentum, invmomentofinertia);
if (vectorDot(angularmomentum, angularmomentum) > 1.0e+5) vectorSet(angularmomentum, 0, 0, 0);
calculateStateVariables();
float velocitydt[3];
vectorScale(velocitydt, velocity, dt);
vectorAdd(position, velocitydt);
float rotationdt[9];
if (vectorIsZero(angularmomentum)){
matrixIdentity(rotationdt);
} else{
float angularvelocitydt[3];
vectorScale(angularvelocitydt, angularvelocity, dt);
matrixCreateRotation(rotationdt, angularvelocitydt);
}
matrixMultiply(rotation, rotation, rotationdt);
vectorScale(angularmomentum, 0.99);
} }
void Object::calculateStateVariables(void){ void Object::setPosition(float x, float y, float z) {
getVelocity(velocity); position[0] = x;
position[1] = y;
if (vectorIsZero(angularmomentum)){ position[2] = z;
invmomentofinertia = 0;
} else{
invmomentofinertia = invmass * 1.0 / geometry->calculateMomentOfInertia(angularmomentum);
}
vectorScale(angularvelocity, angularmomentum, invmomentofinertia);
} }
void Object::setPosition(float x, float y, float z){ void Object::getPosition(float *position) {
position[0] = x; vectorCopy(position, this->position);
position[1] = y;
position[2] = z;
} }
void Object::getPosition(float *position){ void Object::getVelocity(float *velocity) {
vectorCopy(position, this->position); vectorCopy(velocity, momentum);
vectorScale(velocity, invmass);
} }
void Object::getVelocity(float *velocity){ void Object::getVelocity(float *velocity, float *point) {
vectorCopy(velocity, momentum); getVelocity(velocity);
vectorScale(velocity, invmass);
float tangentialvelocity[3];
getTangentialVelocity(tangentialvelocity, point);
// float tv[3];
// transformVector(tv, tangentialvelocity);
vectorAdd(velocity, tangentialvelocity);
} }
void Object::getVelocity(float *velocity, float *point){ void Object::getTangentialVelocity(float *target, float *point) {
getVelocity(velocity); if (vectorIsZero(angularmomentum)) {
vectorSet(target, 0, 0, 0);
return;
}
float tangentialvelocity[3]; vectorCross(target, angularmomentum, point);
getTangentialVelocity(tangentialvelocity, point); vectorScale(target, invmomentofinertia);
//float tv[3];
//transformVector(tv, tangentialvelocity);
vectorAdd(velocity, tangentialvelocity);
} }
void Object::getTangentialVelocity(float *target, float *point){ void Object::getMomentum(float *momentum) {
if (vectorIsZero(angularmomentum)){ vectorCopy(momentum, this->momentum);
vectorSet(target, 0, 0, 0);
return;
}
vectorCross(target, angularmomentum, point);
vectorScale(target, invmomentofinertia);
} }
void Object::getMomentum(float *momentum){ void Object::setMass(float mass) {
vectorCopy(momentum, this->momentum); if (mass == 0)
this->invmass = 0;
else
this->invmass = 1.0 / mass;
} }
void Object::setMass(float mass){ float Object::getMass(void) {
if (mass == 0) this->invmass = 0; if (invmass == 0)
else this->invmass = 1.0 / mass; return 0;
return 1.0 / invmass;
} }
float Object::getMass(void){ void Object::setCollisionGroup(int group) { this->collisiongroup = group; }
if (invmass == 0) return 0;
return 1.0 / invmass; int Object::getCollisionGroup(void) { return collisiongroup; }
void Object::addImpulse(float *impulse, float *contactpoint) {
if (invmass == 0)
return;
float angularimpulse[3];
vectorCross(angularimpulse, contactpoint, impulse);
vectorAdd(angularmomentum, angularimpulse);
vectorAdd(momentum, impulse);
float t1[3], t2[3];
vectorAdd(t1, contactpoint, position);
vectorNormalize(t2, impulse);
vectorAdd(t2, t1);
// addGraphicsVector(t1, t2, vectorLength(impulse));
} }
void Object::setCollisionGroup(int group){ void Object::addExternalForce(float *force) {
this->collisiongroup = group; float impulse[3];
vectorScale(impulse, force, DT);
float contact[3] = {0, 0, 0};
this->addImpulse(impulse, contact);
} }
int Object::getCollisionGroup(void){ void Object::transformPoint(float *newpoint, float *oldpoint) {
return collisiongroup; vectorMatrixMultiply(newpoint, oldpoint, rotation);
vectorAdd(newpoint, position);
} }
void Object::addImpulse(float *impulse, float *contactpoint){ void Object::unTransformPoint(float *newpoint, float *oldpoint) {
if (invmass == 0) return; vectorSub(newpoint, oldpoint, position);
float angularimpulse[3]; float rotmat[9];
vectorCross(angularimpulse, contactpoint, impulse); matrixTranspose(rotmat, rotation);
vectorAdd(angularmomentum, angularimpulse); vectorMatrixMultiply(newpoint, newpoint, rotmat);
vectorAdd(momentum, impulse);
float t1[3], t2[3];
vectorAdd(t1, contactpoint, position);
vectorNormalize(t2, impulse);
vectorAdd(t2, t1);
//addGraphicsVector(t1, t2, vectorLength(impulse));
} }
void Object::addExternalForce(float *force){ void Object::transformVector(float *newvector, float *oldvector) {
float impulse[3]; vectorMatrixMultiply(newvector, oldvector, rotation);
vectorScale(impulse, force, DT);
float contact[3] = {0, 0, 0};
this->addImpulse(impulse, contact);
} }
void Object::transformPoint(float *newpoint, float *oldpoint){ void Object::unTransformVector(float *newvector, float *oldvector) {
vectorMatrixMultiply(newpoint, oldpoint, rotation); float rotmat[9];
vectorAdd(newpoint, position); matrixTranspose(rotmat, rotation);
vectorMatrixMultiply(newvector, oldvector, rotmat);
} }
void Object::unTransformPoint(float *newpoint, float *oldpoint){ void Object::hitForce(float speed, float *speed2, Object *source) {
vectorSub(newpoint, oldpoint, position); float tolerance = 1.0;
float rotmat[9]; if (speed > tolerance) {
matrixTranspose(rotmat, rotation); Sound *sound;
vectorMatrixMultiply(newpoint, newpoint, rotmat); if (rand() & 1)
sound = softhitsound1;
else
sound = softhitsound2;
float volume = (speed - tolerance) * 2;
if (volume > 1)
volume = 1;
sound->setVolume(volume);
sound->play(30 + random(70));
}
} }
void Object::transformVector(float *newvector, float *oldvector){ void Object::setGravity(bool enabled) { gravity = enabled; }
vectorMatrixMultiply(newvector, oldvector, rotation);
} void Object::draw(void) {
glPushMatrix();
void Object::unTransformVector(float *newvector, float *oldvector){ glTranslatef(position[0], position[1], position[2]);
float rotmat[9];
matrixTranspose(rotmat, rotation); GLfloat glmatrix[16] = {rotation[0], rotation[1], rotation[2], 0,
vectorMatrixMultiply(newvector, oldvector, rotmat); rotation[3], rotation[4], rotation[5], 0,
} rotation[6], rotation[7], rotation[8], 0,
0, 0, 0, 1};
glMultMatrixf(glmatrix);
void Object::hitForce(float speed, float *speed2, Object *source){
float tolerance = 1.0; if (appearance != NULL)
if (speed > tolerance){ appearance->draw();
Sound *sound;
if (rand()&1) sound = softhitsound1; glPopMatrix();
else sound = softhitsound2;
float volume = (speed-tolerance)*2;
if (volume > 1) volume = 1;
sound->setVolume(volume);
sound->play(30 + random(70));
}
}
void Object::setGravity(bool enabled){
gravity = enabled;
}
void Object::draw(void){
glPushMatrix();
glTranslatef(position[0], position[1], position[2]);
GLfloat glmatrix[16] = {
rotation[0], rotation[1], rotation[2], 0,
rotation[3], rotation[4], rotation[5], 0,
rotation[6], rotation[7], rotation[8], 0,
0 , 0 , 0 , 1};
glMultMatrixf(glmatrix);
if (appearance != NULL) appearance->draw();
glPopMatrix();
} }

182
src/object.h
View file

@ -10,137 +10,119 @@ class Object;
#include "shape.h" #include "shape.h"
#include "appearance.h" #include "appearance.h"
struct objectlist{ struct objectlist {
Object *object; Object *object;
objectlist *next; objectlist *next;
}; };
class Object{ class Object {
public: public:
float invmass; float invmass;
/* Linear movement: /* Linear movement:
* position <-> paikka (x) * position <-> paikka (x)
* velocity <-> nopeus (v) * velocity <-> nopeus (v)
* momentum <-> liikemäärä (p) * momentum <-> liikemäärä (p)
* force <-> voima (F) * force <-> voima (F)
* x' = v * x' = v
* p' = F * p' = F
* p = mv * p = mv
* F = ma * F = ma
* v' = a * v' = a
*/ */
float position[3]; float position[3];
//derivative: velocity = momentum / mass // derivative: velocity = momentum / mass
float momentum[3];//, oldmomentum[3]; float momentum[3]; //, oldmomentum[3];
//derivative: force // derivative: force
//float force[3]; //Temporary properties // float force[3]; //Temporary properties
//float externalforce[3]; // float externalforce[3];
/* Angular movement:
* rotation <-> orientaatio (R)
* angular velocity <-> kulmanopeus (w)
* angular momentum <-> pyörimisliikemäärä, vääntömomentti (L)
* torque <-> voiman momentti (M,T)
* moment of inertia <-> hitausmomentti (J,I)
* angular acceleration <-> kulmakiihtyvyys (a)
* L = J*w
* R' = Star(L) * R
* T = J*a
* w' = a
* L' = T
*/
/* Angular movement: float invmomentofinertia;
* rotation <-> orientaatio (R)
* angular velocity <-> kulmanopeus (w)
* angular momentum <-> pyörimisliikemäärä, vääntömomentti (L)
* torque <-> voiman momentti (M,T)
* moment of inertia <-> hitausmomentti (J,I)
* angular acceleration <-> kulmakiihtyvyys (a)
* L = J*w
* R' = Star(L) * R
* T = J*a
* w' = a
* L' = T
*/
float invmomentofinertia; float rotation[9];
// derivative: StarOperation(angularvelocity) * rotation
float rotation[9]; float angularmomentum[3];
//derivative: StarOperation(angularvelocity) * rotation // angular momentum = angular velocity * moment of inertia
// derivative: torque = angular acceleration * moment of inertia
float angularmomentum[3]; // float torque[3]; //Temporary property
//angular momentum = angular velocity * moment of inertia
//derivative: torque = angular acceleration * moment of inertia
//float torque[3]; //Temporary property void moveStep(float dt);
// void applyForces(float dt);
void calculateStateVariables(void);
void moveStep(float dt); int collisiongroup;
//void applyForces(float dt);
void calculateStateVariables(void); void addImpulse(float *impulse, float *contactpoint);
int collisiongroup; Appearance *appearance;
Shape *geometry;
void addImpulse(float *impulse, float *contactpoint); bool gravity;
Appearance *appearance; Object(void);
Shape *geometry;
bool gravity; virtual void prepare(void);
virtual void move(void);
virtual void draw(void);
void setPosition(float x, float y, float z);
void getPosition(float *position);
// Gets velocity from object and return it in "velocity"
void getVelocity(float *velocity);
Object(void); // Gets velocity from object for point "point" with
// tangential speed and return it in "velocity"
void getVelocity(float *velocity, float *point);
virtual void prepare(void); void getTangentialVelocity(float *target, float *point);
virtual void move(void);
virtual void draw(void);
void setPosition(float x, float y, float z); void getMomentum(float *momentum);
void getPosition(float *position); // void getForce(float *force);
void setMass(float mass);
float getMass(void);
void setCollisionGroup(int group);
int getCollisionGroup(void);
//Gets velocity from object and return it in "velocity" void transformPoint(float *newpoint, float *oldpoint);
void getVelocity(float *velocity); void unTransformPoint(float *newpoint, float *oldpoint);
void transformVector(float *newvector, float *oldvector);
void unTransformVector(float *newvector, float *oldvector);
//Gets velocity from object for point "point" with void addExternalForce(float *force);
//tangential speed and return it in "velocity"
void getVelocity(float *velocity, float *point);
void getTangentialVelocity(float *target, float *point); void setGravity(bool enabled);
void getMomentum(float *momentum); virtual void hitForce(float speed, float *speed2, Object *source);
//void getForce(float *force);
void setMass(float mass);
float getMass(void);
void setCollisionGroup(int group);
int getCollisionGroup(void);
void transformPoint(float *newpoint, float *oldpoint); friend class ObjectLink;
void unTransformPoint(float *newpoint, float *oldpoint); // friend void collide(Object *source, Object *target, float *normal, float
void transformVector(float *newvector, float *oldvector); // *contactpoint);
void unTransformVector(float *newvector, float *oldvector); friend bool checkCollisions(Object *object, float *contactnormal);
void addExternalForce(float *force); // Temporary state variables
float velocity[3];
void setGravity(bool enabled); float angularvelocity[3];
virtual void hitForce(float speed, float *speed2, Object *source);
friend class ObjectLink;
//friend void collide(Object *source, Object *target, float *normal, float *contactpoint);
friend bool checkCollisions(Object *object, float *contactnormal);
//Temporary state variables
float velocity[3];
float angularvelocity[3];
}; };
#endif #endif

494
src/objectfactory.cpp
View file

@ -12,250 +12,249 @@
#include "objectfactory.h" #include "objectfactory.h"
#include "glapi.h" #include "glapi.h"
MeshObject *createPyramid(float width, float height) {
Mesh *mesh = new Mesh();
mesh->vertexcount = 5;
mesh->vertices = new Vertex[5];
vectorSet(mesh->vertices[0].position, width, 0, 0);
vectorSet(mesh->vertices[0].normal, 1, 0, 0);
vectorSet(mesh->vertices[1].position, -width, 0, 0);
vectorSet(mesh->vertices[1].normal, -1, 0, 0);
vectorSet(mesh->vertices[2].position, 0, 0, width);
vectorSet(mesh->vertices[2].normal, 0, 0, 1);
vectorSet(mesh->vertices[3].position, 0, 0, -width);
vectorSet(mesh->vertices[3].normal, 0, 0, -1);
vectorSet(mesh->vertices[4].position, 0, height, 0);
vectorSet(mesh->vertices[4].normal, 0, 1, 0);
MeshObject *createPyramid(float width, float height){ mesh->polygoncount = 5;
Mesh *mesh = new Mesh(); mesh->polygons = new class Polygon[5];
mesh->vertexcount = 5;
mesh->vertices = new Vertex[5];
vectorSet(mesh->vertices[0].position, width, 0, 0);
vectorSet(mesh->vertices[0].normal, 1, 0, 0);
vectorSet(mesh->vertices[1].position, -width, 0, 0);
vectorSet(mesh->vertices[1].normal, -1, 0, 0);
vectorSet(mesh->vertices[2].position, 0, 0, width);
vectorSet(mesh->vertices[2].normal, 0, 0, 1);
vectorSet(mesh->vertices[3].position, 0, 0, -width);
vectorSet(mesh->vertices[3].normal, 0, 0, -1);
vectorSet(mesh->vertices[4].position, 0, height, 0);
vectorSet(mesh->vertices[4].normal, 0, 1, 0);
mesh->polygoncount = 5; mesh->polygons[0].vertexcount = 3;
mesh->polygons = new class Polygon[5]; mesh->polygons[0].vertices = new Vertex *[3];
mesh->polygons[0].vertices[0] = &mesh->vertices[4];
mesh->polygons[0].vertices[1] = &mesh->vertices[0];
mesh->polygons[0].vertices[2] = &mesh->vertices[3];
mesh->polygons[0].vertexcount = 3; mesh->polygons[1].vertexcount = 3;
mesh->polygons[0].vertices = new Vertex *[3]; mesh->polygons[1].vertices = new Vertex *[3];
mesh->polygons[0].vertices[0] = &mesh->vertices[4]; mesh->polygons[1].vertices[0] = &mesh->vertices[4];
mesh->polygons[0].vertices[1] = &mesh->vertices[0]; mesh->polygons[1].vertices[1] = &mesh->vertices[3];
mesh->polygons[0].vertices[2] = &mesh->vertices[3]; mesh->polygons[1].vertices[2] = &mesh->vertices[1];
mesh->polygons[1].vertexcount = 3; mesh->polygons[2].vertexcount = 3;
mesh->polygons[1].vertices = new Vertex *[3]; mesh->polygons[2].vertices = new Vertex *[3];
mesh->polygons[1].vertices[0] = &mesh->vertices[4]; mesh->polygons[2].vertices[0] = &mesh->vertices[4];
mesh->polygons[1].vertices[1] = &mesh->vertices[3]; mesh->polygons[2].vertices[1] = &mesh->vertices[1];
mesh->polygons[1].vertices[2] = &mesh->vertices[1]; mesh->polygons[2].vertices[2] = &mesh->vertices[2];
mesh->polygons[2].vertexcount = 3; mesh->polygons[3].vertexcount = 3;
mesh->polygons[2].vertices = new Vertex *[3]; mesh->polygons[3].vertices = new Vertex *[3];
mesh->polygons[2].vertices[0] = &mesh->vertices[4]; mesh->polygons[3].vertices[0] = &mesh->vertices[4];
mesh->polygons[2].vertices[1] = &mesh->vertices[1]; mesh->polygons[3].vertices[1] = &mesh->vertices[2];
mesh->polygons[2].vertices[2] = &mesh->vertices[2]; mesh->polygons[3].vertices[2] = &mesh->vertices[0];
mesh->polygons[3].vertexcount = 3; mesh->polygons[4].vertexcount = 4;
mesh->polygons[3].vertices = new Vertex *[3]; mesh->polygons[4].vertices = new Vertex *[4];
mesh->polygons[3].vertices[0] = &mesh->vertices[4]; mesh->polygons[4].vertices[0] = &mesh->vertices[0];
mesh->polygons[3].vertices[1] = &mesh->vertices[2]; mesh->polygons[4].vertices[1] = &mesh->vertices[2];
mesh->polygons[3].vertices[2] = &mesh->vertices[0]; mesh->polygons[4].vertices[2] = &mesh->vertices[1];
mesh->polygons[4].vertices[3] = &mesh->vertices[3];
mesh->polygons[4].vertexcount = 4; mesh->polygons[0].smooth = false;
mesh->polygons[4].vertices = new Vertex *[4]; mesh->polygons[1].smooth = false;
mesh->polygons[4].vertices[0] = &mesh->vertices[0]; mesh->polygons[2].smooth = false;
mesh->polygons[4].vertices[1] = &mesh->vertices[2]; mesh->polygons[3].smooth = false;
mesh->polygons[4].vertices[2] = &mesh->vertices[1]; mesh->polygons[4].smooth = false;
mesh->polygons[4].vertices[3] = &mesh->vertices[3];
mesh->polygons[0].smooth = false; mesh->createPlanes();
mesh->polygons[1].smooth = false;
mesh->polygons[2].smooth = false;
mesh->polygons[3].smooth = false;
mesh->polygons[4].smooth = false;
mesh->createPlanes(); MeshObject *object = new MeshObject(mesh);
return object;
MeshObject *object = new MeshObject(mesh);
return object;
} }
MeshObject *createSpherePool(float width, float height){ MeshObject *createSpherePool(float width, float height) {
int grid = 16; int grid = 16;
Mesh *mesh = new Mesh(); Mesh *mesh = new Mesh();
mesh->vertexcount = (grid+1)*(grid+1); mesh->vertexcount = (grid + 1) * (grid + 1);
mesh->vertices = new Vertex[mesh->vertexcount]; mesh->vertices = new Vertex[mesh->vertexcount];
int x, z; int x, z;
for (z = 0; z < grid; z++){ for (z = 0; z < grid; z++) {
float pz = (2.0*z/(grid-1) - 1)*width; float pz = (2.0 * z / (grid - 1) - 1) * width;
for (x = 0; x < grid; x++){ for (x = 0; x < grid; x++) {
float px = (2.0*x/(grid-1) - 1)*width; float px = (2.0 * x / (grid - 1) - 1) * width;
//float py = randomf(1); // float py = randomf(1);
float l = sqrt(pz*pz + px*px)*1; float l = sqrt(pz * pz + px * px) * 1;
if (l > width) l = width; if (l > width)
l = l/width; l = width;
//l = l*l; l = l / width;
float py = height*(sin(PI*(1.5+l*2))+1)/2; // l = l*l;
vectorSet(mesh->vertices[z * grid + x].position, px, py, pz); float py = height * (sin(PI * (1.5 + l * 2)) + 1) / 2;
} vectorSet(mesh->vertices[z * grid + x].position, px, py, pz);
} }
}
mesh->polygoncount = (grid-1)*(grid-1); mesh->polygoncount = (grid - 1) * (grid - 1);
mesh->polygons = new class Polygon[mesh->polygoncount]; mesh->polygons = new class Polygon[mesh->polygoncount];
for (z = 0; z < grid-1; z++){ for (z = 0; z < grid - 1; z++) {
for (x = 0; x < grid-1; x++){ for (x = 0; x < grid - 1; x++) {
class Polygon *poly = &mesh->polygons[z * (grid-1) + x]; class Polygon *poly = &mesh->polygons[z * (grid - 1) + x];
poly->vertexcount = 4; poly->vertexcount = 4;
poly->vertices = new Vertex *[4]; poly->vertices = new Vertex *[4];
poly->vertices[0] = &mesh->vertices[z * grid + x + 1]; poly->vertices[0] = &mesh->vertices[z * grid + x + 1];
poly->vertices[1] = &mesh->vertices[z * grid + x ]; poly->vertices[1] = &mesh->vertices[z * grid + x];
poly->vertices[2] = &mesh->vertices[(z + 1) * grid + x]; poly->vertices[2] = &mesh->vertices[(z + 1) * grid + x];
poly->vertices[3] = &mesh->vertices[(z + 1) * grid + x + 1]; poly->vertices[3] = &mesh->vertices[(z + 1) * grid + x + 1];
poly->smooth = true; poly->smooth = true;
}
} }
}
mesh->createPlanes();
mesh->createVertexnormals();
mesh->createPlanes(); MeshObject *object = new MeshObject(mesh);
mesh->createVertexnormals(); return object;
MeshObject *object = new MeshObject(mesh);
return object;
} }
Mesh *createBox(float x1, float x2, float y1, float y2, float z1, float z2){ Mesh *createBox(float x1, float x2, float y1, float y2, float z1, float z2) {
Mesh *mesh = new Mesh(); Mesh *mesh = new Mesh();
mesh->vertexcount = 8; mesh->vertexcount = 8;
mesh->vertices = new Vertex[8]; mesh->vertices = new Vertex[8];
vectorSet(mesh->vertices[0].position, x1, y1, z1); vectorSet(mesh->vertices[0].position, x1, y1, z1);
vectorSet(mesh->vertices[1].position, x2, y1, z1); vectorSet(mesh->vertices[1].position, x2, y1, z1);
vectorSet(mesh->vertices[2].position, x1, y2, z1); vectorSet(mesh->vertices[2].position, x1, y2, z1);
vectorSet(mesh->vertices[3].position, x2, y2, z1); vectorSet(mesh->vertices[3].position, x2, y2, z1);
vectorSet(mesh->vertices[4].position, x1, y1, z2); vectorSet(mesh->vertices[4].position, x1, y1, z2);
vectorSet(mesh->vertices[5].position, x2, y1, z2); vectorSet(mesh->vertices[5].position, x2, y1, z2);
vectorSet(mesh->vertices[6].position, x1, y2, z2); vectorSet(mesh->vertices[6].position, x1, y2, z2);
vectorSet(mesh->vertices[7].position, x2, y2, z2); vectorSet(mesh->vertices[7].position, x2, y2, z2);
mesh->polygoncount = 6; mesh->polygoncount = 6;
mesh->polygons = new class Polygon[6]; mesh->polygons = new class Polygon[6];
//Back // Back
mesh->polygons[0].vertexcount = 4; mesh->polygons[0].vertexcount = 4;
mesh->polygons[0].vertices = new Vertex *[4]; mesh->polygons[0].vertices = new Vertex *[4];
mesh->polygons[0].vertices[0] = &mesh->vertices[0]; mesh->polygons[0].vertices[0] = &mesh->vertices[0];
mesh->polygons[0].vertices[1] = &mesh->vertices[2]; mesh->polygons[0].vertices[1] = &mesh->vertices[2];
mesh->polygons[0].vertices[2] = &mesh->vertices[3]; mesh->polygons[0].vertices[2] = &mesh->vertices[3];
mesh->polygons[0].vertices[3] = &mesh->vertices[1]; mesh->polygons[0].vertices[3] = &mesh->vertices[1];
//Front // Front
mesh->polygons[1].vertexcount = 4; mesh->polygons[1].vertexcount = 4;
mesh->polygons[1].vertices = new Vertex *[4]; mesh->polygons[1].vertices = new Vertex *[4];
mesh->polygons[1].vertices[0] = &mesh->vertices[4]; mesh->polygons[1].vertices[0] = &mesh->vertices[4];
mesh->polygons[1].vertices[1] = &mesh->vertices[5]; mesh->polygons[1].vertices[1] = &mesh->vertices[5];
mesh->polygons[1].vertices[2] = &mesh->vertices[7]; mesh->polygons[1].vertices[2] = &mesh->vertices[7];
mesh->polygons[1].vertices[3] = &mesh->vertices[6]; mesh->polygons[1].vertices[3] = &mesh->vertices[6];
//Left // Left
mesh->polygons[2].vertexcount = 4; mesh->polygons[2].vertexcount = 4;
mesh->polygons[2].vertices = new Vertex *[4]; mesh->polygons[2].vertices = new Vertex *[4];
mesh->polygons[2].vertices[0] = &mesh->vertices[0]; mesh->polygons[2].vertices[0] = &mesh->vertices[0];
mesh->polygons[2].vertices[1] = &mesh->vertices[4]; mesh->polygons[2].vertices[1] = &mesh->vertices[4];
mesh->polygons[2].vertices[2] = &mesh->vertices[6]; mesh->polygons[2].vertices[2] = &mesh->vertices[6];
mesh->polygons[2].vertices[3] = &mesh->vertices[2]; mesh->polygons[2].vertices[3] = &mesh->vertices[2];
//Right // Right
mesh->polygons[3].vertexcount = 4; mesh->polygons[3].vertexcount = 4;
mesh->polygons[3].vertices = new Vertex *[4]; mesh->polygons[3].vertices = new Vertex *[4];
mesh->polygons[3].vertices[0] = &mesh->vertices[1]; mesh->polygons[3].vertices[0] = &mesh->vertices[1];
mesh->polygons[3].vertices[1] = &mesh->vertices[3]; mesh->polygons[3].vertices[1] = &mesh->vertices[3];
mesh->polygons[3].vertices[2] = &mesh->vertices[7]; mesh->polygons[3].vertices[2] = &mesh->vertices[7];
mesh->polygons[3].vertices[3] = &mesh->vertices[5]; mesh->polygons[3].vertices[3] = &mesh->vertices[5];
//Top // Top
mesh->polygons[4].vertexcount = 4; mesh->polygons[4].vertexcount = 4;
mesh->polygons[4].vertices = new Vertex *[4]; mesh->polygons[4].vertices = new Vertex *[4];
mesh->polygons[4].vertices[0] = &mesh->vertices[2]; mesh->polygons[4].vertices[0] = &mesh->vertices[2];
mesh->polygons[4].vertices[1] = &mesh->vertices[6]; mesh->polygons[4].vertices[1] = &mesh->vertices[6];
mesh->polygons[4].vertices[2] = &mesh->vertices[7]; mesh->polygons[4].vertices[2] = &mesh->vertices[7];
mesh->polygons[4].vertices[3] = &mesh->vertices[3]; mesh->polygons[4].vertices[3] = &mesh->vertices[3];
//Bottom // Bottom
mesh->polygons[5].vertexcount = 4; mesh->polygons[5].vertexcount = 4;
mesh->polygons[5].vertices = new Vertex *[4]; mesh->polygons[5].vertices = new Vertex *[4];
mesh->polygons[5].vertices[0] = &mesh->vertices[0]; mesh->polygons[5].vertices[0] = &mesh->vertices[0];
mesh->polygons[5].vertices[1] = &mesh->vertices[1]; mesh->polygons[5].vertices[1] = &mesh->vertices[1];
mesh->polygons[5].vertices[2] = &mesh->vertices[5]; mesh->polygons[5].vertices[2] = &mesh->vertices[5];
mesh->polygons[5].vertices[3] = &mesh->vertices[4]; mesh->polygons[5].vertices[3] = &mesh->vertices[4];
mesh->createPlanes(); mesh->createPlanes();
mesh->createEdges(); mesh->createEdges();
//mesh->createVertexnormals(); // mesh->createVertexnormals();
return mesh; return mesh;
} }
float getValueFromString(char *data) {
float getValueFromString(char* data){ while (*data == ' ')
while(*data==' ') data++; data++;
char* enddata=data; char *enddata = data;
//char oldchar; // char oldchar;
do{ do {
enddata++; enddata++;
if ((*enddata<'0' || *enddata>'9') && (*enddata!='.')) *enddata=0; if ((*enddata < '0' || *enddata > '9') && (*enddata != '.'))
} while(*enddata!=0); *enddata = 0;
float ret=atof(data); } while (*enddata != 0);
*enddata=' '; float ret = atof(data);
*enddata = ' ';
return ret; return ret;
} }
char* findStringEnd(char* data, char* findstring){ char *findStringEnd(char *data, char *findstring) {
return strstr(data,findstring)+strlen(findstring); return strstr(data, findstring) + strlen(findstring);
} }
Mesh* loadAscModel(char *filename, float scale){ Mesh *loadAscModel(char *filename, float scale) {
float zeroOffset[3] = {0.0, 0.0, 0.0}; float zeroOffset[3] = {0.0, 0.0, 0.0};
return loadAscModel(filename, scale, (float*)zeroOffset); return loadAscModel(filename, scale, (float *)zeroOffset);
} }
Mesh* loadAscModel(char *filename, float scale, float* offset){ Mesh *loadAscModel(char *filename, float scale, float *offset) {
Mesh* target = new Mesh(); Mesh *target = new Mesh();
FILE *file;
FILE* file;
float x, y, z; float x, y, z;
if ((file=fopen(filename,"rt"))==NULL){ if ((file = fopen(filename, "rt")) == NULL) {
printf("Unable to open file %s\n",filename); printf("Unable to open file %s\n", filename);
return NULL; return NULL;
} }
fseek(file,0,SEEK_END); fseek(file, 0, SEEK_END);
int size=ftell(file); int size = ftell(file);
fseek(file,0,SEEK_SET); fseek(file, 0, SEEK_SET);
char* data=(char*)malloc(size*sizeof(char)); char *data = (char *)malloc(size * sizeof(char));
fread(data,size,1,file); fread(data, size, 1, file);
fclose(file); fclose(file);
char* vert=findStringEnd(data,"Vertices:"); char *vert = findStringEnd(data, "Vertices:");
target->vertexcount=getValueFromString(vert); target->vertexcount = getValueFromString(vert);
char* face=findStringEnd(data,"Faces:"); char *face = findStringEnd(data, "Faces:");
target->polygoncount=getValueFromString(face); target->polygoncount = getValueFromString(face);
target->vertices = new Vertex[target->vertexcount]; target->vertices = new Vertex[target->vertexcount];
target->polygons = new class Polygon[target->polygoncount]; target->polygons = new class Polygon[target->polygoncount];
int i; int i;
vert=findStringEnd(data,"Vertex list:"); vert = findStringEnd(data, "Vertex list:");
for (i=0;i<target->vertexcount;i++){ for (i = 0; i < target->vertexcount; i++) {
vert=findStringEnd(vert,"Vertex"); vert = findStringEnd(vert, "Vertex");
vert=findStringEnd(vert,"X:"); vert = findStringEnd(vert, "X:");
x = getValueFromString(vert)*scale; x = getValueFromString(vert) * scale;
vert=findStringEnd(vert,"Y:"); vert = findStringEnd(vert, "Y:");
y = getValueFromString(vert)*scale; y = getValueFromString(vert) * scale;
vert=findStringEnd(vert,"Z:"); vert = findStringEnd(vert, "Z:");
z = getValueFromString(vert)*scale; z = getValueFromString(vert) * scale;
vectorSet(target->vertices[i].position, x + offset[0], y + offset[1] , z + offset[2]); vectorSet(target->vertices[i].position, x + offset[0], y + offset[1],
//recycle variables for texture coordinates z + offset[2]);
// recycle variables for texture coordinates
vert = findStringEnd(vert, "U:"); vert = findStringEnd(vert, "U:");
x = getValueFromString(vert); x = getValueFromString(vert);
vert = findStringEnd(vert, "V:"); vert = findStringEnd(vert, "V:");
@ -263,62 +262,93 @@ Mesh* loadAscModel(char *filename, float scale, float* offset){
target->vertices[i].setTexCoords(x, y); target->vertices[i].setTexCoords(x, y);
} }
int vnum; int vnum;
face=findStringEnd(data,"Face list:"); face = findStringEnd(data, "Face list:");
for (i = 0; i < target->polygoncount; i++) {
for (i=0;i<target->polygoncount;i++){ face = findStringEnd(face, "Face");
face=findStringEnd(face,"Face"); face = findStringEnd(face, "A:");
face=findStringEnd(face,"A:"); vnum = getValueFromString(face);
vnum=getValueFromString(face);
target->polygons[i].vertexcount = 3; target->polygons[i].vertexcount = 3;
target->polygons[i].vertices = new Vertex *[3]; target->polygons[i].vertices = new Vertex *[3];
target->polygons[i].vertices[0]=&(target->vertices[vnum]); target->polygons[i].vertices[0] = &(target->vertices[vnum]);
target->polygons[i].vertices[0]->setTexCoords(target->vertices[vnum].texcoords[0], target->polygons[i].vertices[0]->setTexCoords(
target->vertices[vnum].texcoords[1]); target->vertices[vnum].texcoords[0],
face=findStringEnd(face,"B:"); target->vertices[vnum].texcoords[1]);
vnum=getValueFromString(face); face = findStringEnd(face, "B:");
target->polygons[i].vertices[1]=&(target->vertices[vnum]); vnum = getValueFromString(face);
target->polygons[i].vertices[1]->setTexCoords(target->vertices[vnum].texcoords[0], target->polygons[i].vertices[1] = &(target->vertices[vnum]);
target->vertices[vnum].texcoords[1]); target->polygons[i].vertices[1]->setTexCoords(
face=findStringEnd(face,"C:"); target->vertices[vnum].texcoords[0],
vnum=getValueFromString(face); target->vertices[vnum].texcoords[1]);
target->polygons[i].vertices[2]=&(target->vertices[vnum]); face = findStringEnd(face, "C:");
target->polygons[i].vertices[2]->setTexCoords(target->vertices[vnum].texcoords[0], vnum = getValueFromString(face);
target->vertices[vnum].texcoords[1]); target->polygons[i].vertices[2] = &(target->vertices[vnum]);
char *face2=findStringEnd(face,"Nosmooth"); target->polygons[i].vertices[2]->setTexCoords(
char *face3=findStringEnd(face,"Smoothing"); target->vertices[vnum].texcoords[0],
if (face2 > face && face2 < face3) target->polygons[i].realsmooth = true; target->vertices[vnum].texcoords[1]);
char *face2 = findStringEnd(face, "Nosmooth");
char *face3 = findStringEnd(face, "Smoothing");
if (face2 > face && face2 < face3)
target->polygons[i].realsmooth = true;
} }
free(data); free(data);
data = NULL; data = NULL;
//target->createEdges(); // target->createEdges();
target->createPlanes(); target->createPlanes();
target->createVertexnormals(); target->createVertexnormals();
//return new MeshObject(target); // return new MeshObject(target);
return target; return target;
} }
void drawTrophy(void){ void drawTrophy(void) {
point2d points[14]; point2d points[14];
int width = 3; int width = 3;
int i = 0; int i = 0;
points[i].x = 0.0; points[i].y = 0.0; i++; points[i].x = 0.0;
points[i].x = width; points[i].y = 0.0; i++; points[i].y = 0.0;
points[i].x = width-2; points[i].y = 2.0; i++; i++;
points[i].x = width-2; points[i].y = 3.0; i++; points[i].x = width;
points[i].x = width-1; points[i].y = 4.0; i++; points[i].y = 0.0;
points[i].x = width-2; points[i].y = 5.0; i++; i++;
points[i].x = width-2; points[i].y = 6.0; i++; points[i].x = width - 2;
points[i].x = width-1; points[i].y = 8.0; i++; points[i].y = 2.0;
points[i].x = width; points[i].y = 9.0; i++; i++;
points[i].x = width+1; points[i].y = 11.0; i++; points[i].x = width - 2;
points[i].x = width+2; points[i].y = 15.0; i++; points[i].y = 3.0;
points[i].x = width+3; points[i].y = 21.0; i++; i++;
points[i].x = width+2; points[i].y = 21.0; i++; points[i].x = width - 1;
points[i].x = 0.0; points[i].y = 8.0; i++; points[i].y = 4.0;
i++;
points[i].x = width - 2;
points[i].y = 5.0;
i++;
points[i].x = width - 2;
points[i].y = 6.0;
i++;
points[i].x = width - 1;
points[i].y = 8.0;
i++;
points[i].x = width;
points[i].y = 9.0;
i++;
points[i].x = width + 1;
points[i].y = 11.0;
i++;
points[i].x = width + 2;
points[i].y = 15.0;
i++;
points[i].x = width + 3;
points[i].y = 21.0;
i++;
points[i].x = width + 2;
points[i].y = 21.0;
i++;
points[i].x = 0.0;
points[i].y = 8.0;
i++;
createLathedSurface(points, NULL, i, i*5, i*10); createLathedSurface(points, NULL, i, i * 5, i * 10);
} }

12
src/objectfactory.h
View file

@ -3,14 +3,12 @@
#include "mesh.h" #include "mesh.h"
MeshObject* createPyramid(float width, float height); MeshObject *createPyramid(float width, float height);
MeshObject* createSpherePool(float width, float height); MeshObject *createSpherePool(float width, float height);
Mesh *createBox(float x1, float x2, float y1, float y2, float z1, float z2);
Mesh* createBox(float x1, float x2, float y1, float y2, float z1, float z2); Mesh *loadAscModel(char *filename, float scale, float *offset);
Mesh* loadAscModel(char* filename, float scale, float* offset); Mesh *loadAscModel(char *filename, float scale);
Mesh* loadAscModel(char* filename, float scale);
void drawTrophy(void); void drawTrophy(void);
#endif #endif

211
src/particle.cpp
View file

@ -10,142 +10,143 @@
#include "collision.h" #include "collision.h"
#include "glapi.h" #include "glapi.h"
Particle::Particle(World *world, Mesh *mesh) : MeshObject(mesh) {
Particle::Particle(World *world, Mesh *mesh) : MeshObject(mesh){ this->world = world;
this->world = world;
} }
Contact *contact = new Contact(); Contact *contact = new Contact();
int bloodcount; int bloodcount;
void Particle::move(void){ void Particle::move(void) {
/*if (position[1] + momentum[1] < 0.5){ /*if (position[1] + momentum[1] < 0.5){
currentparticle->velocity.x*=0.8; currentparticle->velocity.x*=0.8;
currentparticle->velocity.y=fabs(currentparticle->velocity.y)*0.8; currentparticle->velocity.y=fabs(currentparticle->velocity.y)*0.8;
currentparticle->velocity.z*=0.8; currentparticle->velocity.z*=0.8;
currentparticle->bounces++; currentparticle->bounces++;
}
currentparticle->position.x+=currentparticle->velocity.x;
currentparticle->position.y+=currentparticle->velocity.y;
currentparticle->position.z+=currentparticle->velocity.z;
currentparticle->angle.x+=currentparticle->velocity.x*50;
currentparticle->angle.y+=currentparticle->velocity.y*50;
currentparticle->angle.z+=currentparticle->velocity.z*50;
currentparticle->velocity.y-=0.003;
if (currentparticle->bounces==3) dieParticle(currentparticle);*/
momentum[1] -= 0.02;
int i;
vectorSet(contact->normal, 0, 1, 0);
contact->object2 = NULL;
bool die = false;
for (i = 0; i < mesh->vertexcount; i++) {
float point[3];
transformPoint(point, mesh->vertices[i].position);
if (point[1] < 0) {
contact->object1 = this;
vectorCopy(contact->position, point);
handleCollision(contact);
/*float impulse[3];
getMomentum(impulse);
impulse[0] = 0;
impulse[1] = fabs(impulse[1]);
impulse[2] = 0;
vectorScale(impulse, 1.1);
addImpulse(impulse, point);
position[1] -= point[1];
momentum[1] = impulse[1]*0.5;*/
} }
currentparticle->position.x+=currentparticle->velocity.x; }
currentparticle->position.y+=currentparticle->velocity.y; /*if (vectorLength(momentum) < 0.5) die = true;
currentparticle->position.z+=currentparticle->velocity.z; if (die) removeBlood(id);*/
currentparticle->angle.x+=currentparticle->velocity.x*50; lifetime++;
currentparticle->angle.y+=currentparticle->velocity.y*50; Object::move();
currentparticle->angle.z+=currentparticle->velocity.z*50;
currentparticle->velocity.y-=0.003;
if (currentparticle->bounces==3) dieParticle(currentparticle);*/
momentum[1] -= 0.02;
int i;
vectorSet(contact->normal, 0, 1, 0);
contact->object2 = NULL;
bool die = false;
for (i = 0; i < mesh->vertexcount; i++){
float point[3];
transformPoint(point, mesh->vertices[i].position);
if (point[1] < 0){
contact->object1 = this;
vectorCopy(contact->position, point);
handleCollision(contact);
/*float impulse[3];
getMomentum(impulse);
impulse[0] = 0;
impulse[1] = fabs(impulse[1]);
impulse[2] = 0;
vectorScale(impulse, 1.1);
addImpulse(impulse, point);
position[1] -= point[1];
momentum[1] = impulse[1]*0.5;*/
}
}
/*if (vectorLength(momentum) < 0.5) die = true;
if (die) removeBlood(id);*/
lifetime++;
Object::move();
if (lifetime > 300) removeBlood(id); if (lifetime > 300)
removeBlood(id);
} }
void Particle::hitForce(float speed, Object *source){ void Particle::hitForce(float speed, Object *source) {
/*bounces++; /*bounces++;
if (bounces == 2){ if (bounces == 2){
removeBlood(id); removeBlood(id);
}*/ }*/
} }
void Particle::create(float *position, float *velocity){ void Particle::create(float *position, float *velocity) {
vectorCopy(this->position, position); vectorCopy(this->position, position);
vectorCopy(this->momentum, velocity); vectorCopy(this->momentum, velocity);
float rotate[3] = {randomf(2)-1, randomf(2)-1, randomf(2)-1}; float rotate[3] = {randomf(2) - 1, randomf(2) - 1, randomf(2) - 1};
vectorCopy(this->angularmomentum, rotate); vectorCopy(this->angularmomentum, rotate);
bounces = 0; bounces = 0;
lifetime = 0; lifetime = 0;
world->addParticle(this); world->addParticle(this);
}
void Particle::destroy(void){
world->removeParticle(this);
} }
void Particle::destroy(void) { world->removeParticle(this); }
Particle **bloodparticles; Particle **bloodparticles;
BloodAppearance::BloodAppearance(int *lifetime) : BasicBlockAppearance(1, 1, 1){ BloodAppearance::BloodAppearance(int *lifetime)
this->lifetime = lifetime; : BasicBlockAppearance(1, 1, 1) {
usematerial = false; this->lifetime = lifetime;
usematerial = false;
} }
void BloodAppearance::draw(void){ void BloodAppearance::draw(void) {
glPushMatrix(); glPushMatrix();
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
float alpha = 1-*lifetime*0.003; float alpha = 1 - *lifetime * 0.003;
if (alpha < 0) alpha = 0; if (alpha < 0)
alpha = 0;
glColor4f(1, 0, 0, alpha);//1.0/(1+*lifetime*0.004)); glColor4f(1, 0, 0, alpha); // 1.0/(1+*lifetime*0.004));
glScalef(0.5, 0.5, 0.5); glScalef(0.5, 0.5, 0.5);
BasicBlockAppearance::draw(); BasicBlockAppearance::draw();
glDisable(GL_BLEND); glDisable(GL_BLEND);
glPopMatrix(); glPopMatrix();
} }
World *bloodworld; World *bloodworld;
void initBloods(World *world){ void initBloods(World *world) {
bloodcount = 0; bloodcount = 0;
bloodparticles = new Particle *[MAXBLOOD]; bloodparticles = new Particle *[MAXBLOOD];
int i; int i;
Mesh *bloodmesh = createBox(-0.5, 0.5, -0.5*BLOCKHEIGHT, 0.5*BLOCKHEIGHT, -0.5, 0.5); Mesh *bloodmesh =
for (i = 0; i < MAXBLOOD; i++){ createBox(-0.5, 0.5, -0.5 * BLOCKHEIGHT, 0.5 * BLOCKHEIGHT, -0.5, 0.5);
bloodparticles[i] = new Particle(world, bloodmesh); for (i = 0; i < MAXBLOOD; i++) {
bloodparticles[i]->appearance = new BloodAppearance(&(bloodparticles[i]->lifetime)); bloodparticles[i] = new Particle(world, bloodmesh);
bloodparticles[i]->setMass(1); bloodparticles[i]->appearance =
bloodparticles[i]->prepare(); new BloodAppearance(&(bloodparticles[i]->lifetime));
//bloodparticles[i]->setGravity(true); bloodparticles[i]->setMass(1);
//bloodparticles[i]->setCollisionGroup(COLLISIONGROUP_PARTICLE); bloodparticles[i]->prepare();
//bloodparticles[i]->id = i; // bloodparticles[i]->setGravity(true);
} // bloodparticles[i]->setCollisionGroup(COLLISIONGROUP_PARTICLE);
bloodworld = world; // bloodparticles[i]->id = i;
}
bloodworld = world;
} }
void createBlood(float *position, float *velocity){ void createBlood(float *position, float *velocity) {
if (bloodcount < MAXBLOOD){ if (bloodcount < MAXBLOOD) {
Particle *currentparticle = bloodparticles[bloodcount]; Particle *currentparticle = bloodparticles[bloodcount];
currentparticle->create(position, velocity); currentparticle->create(position, velocity);
currentparticle->id = bloodcount; currentparticle->id = bloodcount;
bloodcount++; bloodcount++;
} }
} }
void removeBlood(int id){ void removeBlood(int id) {
Particle *particle = bloodparticles[id]; Particle *particle = bloodparticles[id];
particle->destroy(); particle->destroy();
bloodparticles[id] = bloodparticles[bloodcount-1]; bloodparticles[id] = bloodparticles[bloodcount - 1];
bloodparticles[id]->id = id; bloodparticles[id]->id = id;
bloodparticles[bloodcount-1] = particle; bloodparticles[bloodcount - 1] = particle;
bloodcount--; bloodcount--;
} }

38
src/particle.h
View file

@ -8,44 +8,39 @@ class BloodAppearance;
#include "legoblocks.h" #include "legoblocks.h"
#include "world.h" #include "world.h"
class Particle : public MeshObject{ class Particle : public MeshObject {
private: private:
int bounces; int bounces;
bool enabled; bool enabled;
World *world; World *world;
bool alive; bool alive;
public: public:
int lifetime; int lifetime;
int id; int id;
Particle(World *world, Mesh *mesh); Particle(World *world, Mesh *mesh);
void move(void); void move(void);
void hitForce(float speed, Object *source); void hitForce(float speed, Object *source);
void create(float *position, float *velocity);
void create(float *position, float *velocity); void destroy(void);
void destroy(void);
}; };
#define MAXBLOOD 500 #define MAXBLOOD 500
class BloodAppearance : public BasicBlockAppearance {
class BloodAppearance : public BasicBlockAppearance{
private: private:
int *lifetime; int *lifetime;
public: public:
BloodAppearance(int *lifetime); BloodAppearance(int *lifetime);
void draw(void); void draw(void);
}; };
void initBloods(World *world); void initBloods(World *world);
@ -53,4 +48,3 @@ void createBlood(float *position, float *velocity);
void removeBlood(int id); void removeBlood(int id);
#endif #endif

268
src/run.cpp
View file

@ -21,78 +21,76 @@ bool gameinitialized = false;
void initFontTexture(void); void initFontTexture(void);
void initScenes(void){ void initScenes(void) {
knobgllist = glGenLists(1); knobgllist = glGenLists(1);
setDetail(detail); setDetail(detail);
// Simple loading-screen
enable2D();
//Simple loading-screen glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
enable2D(); SDL_GL_SwapBuffers();
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); initFontTexture();
SDL_GL_SwapBuffers();
initFontTexture(); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
print(0.08, 0.4, "Loading...", 0.2);
SDL_GL_SwapBuffers();
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); disable2D();
print(0.08, 0.4, "Loading...", 0.2);
SDL_GL_SwapBuffers();
disable2D(); SKYBOX = -1;
initTextures();
initFight();
initMenu();
SKYBOX = -1; initEnd();
initTextures(); changeGameMode(MENUMODE);
initFight(); // changeGameMode(ENDMODE);
initMenu(); gameinitialized = true;
initEnd();
changeGameMode(MENUMODE);
//changeGameMode(ENDMODE);
gameinitialized = true;
} }
void changeGameMode(int newmode){ void changeGameMode(int newmode) {
gamemode = newmode; gamemode = newmode;
changed = true; changed = true;
} }
void calculateFrame(int framecount){ void calculateFrame(int framecount) {
switch(gamemode){ switch (gamemode) {
case MENUMODE: case MENUMODE:
calculateMenu(framecount); calculateMenu(framecount);
break; break;
case FIGHTMODE: case FIGHTMODE:
calculateFight(framecount); calculateFight(framecount);
break; break;
case ENDMODE: case ENDMODE:
calculateEnd(framecount); calculateEnd(framecount);
break; break;
} }
updateAudio(); updateAudio();
changed = false; changed = false;
} }
void drawFrame(int framecount){ void drawFrame(int framecount) {
if (changed) calculateFrame(framecount); if (changed)
calculateFrame(framecount);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
switch(gamemode){ switch (gamemode) {
case MENUMODE: case MENUMODE:
drawMenu(framecount); drawMenu(framecount);
break; break;
case FIGHTMODE: case FIGHTMODE:
drawFight(framecount); drawFight(framecount);
break; break;
case ENDMODE: case ENDMODE:
drawEnd(framecount); drawEnd(framecount);
break; break;
} }
SDL_GL_SwapBuffers(); SDL_GL_SwapBuffers();
} }
/*int SKY_FRONT_ID; /*int SKY_FRONT_ID;
@ -118,96 +116,92 @@ Texture *damageLeg;
Texture *tuxtexture; Texture *tuxtexture;
Texture *faceTexture; Texture *faceTexture;
void initFontTexture(void){ void initFontTexture(void) {
if (!texturesloaded){ if (!texturesloaded) {
float trans[3] = {1, 0, 0}; float trans[3] = {1, 0, 0};
fonttexture = new Texture(); fonttexture = new Texture();
fonttexture->loadImage(DATAPATH"font.png", trans); fonttexture->loadImage(DATAPATH "font.png", trans);
} else{ } else {
fonttexture->reload(); fonttexture->reload();
} }
} }
void initTextures(void){ void initTextures(void) {
/*SKY_FRONT_ID = DRUID.loadTexture(SKYFRONT); /*SKY_FRONT_ID = DRUID.loadTexture(SKYFRONT);
SKY_BACK_ID = DRUID.loadTexture(SKYBACK); SKY_BACK_ID = DRUID.loadTexture(SKYBACK);
SKY_LEFT_ID = DRUID.loadTexture(SKYLEFT); SKY_LEFT_ID = DRUID.loadTexture(SKYLEFT);
SKY_RIGHT_ID = DRUID.loadTexture(SKYRIGHT); SKY_RIGHT_ID = DRUID.loadTexture(SKYRIGHT);
SKY_TOP_ID = DRUID.loadTexture(SKYTOP); SKY_TOP_ID = DRUID.loadTexture(SKYTOP);
SKY_BOTTOM_ID = DRUID.loadTexture(SKYBOTTOM);*/ SKY_BOTTOM_ID = DRUID.loadTexture(SKYBOTTOM);*/
if (!texturesloaded){ if (!texturesloaded) {
skyfronttexture = new Texture(); skyfronttexture = new Texture();
skyfronttexture->loadImage(SKYFRONT); skyfronttexture->loadImage(SKYFRONT);
skybacktexture = new Texture(); skybacktexture = new Texture();
skybacktexture->loadImage(SKYBACK); skybacktexture->loadImage(SKYBACK);
skylefttexture = new Texture(); skylefttexture = new Texture();
skylefttexture->loadImage(SKYLEFT); skylefttexture->loadImage(SKYLEFT);
skyrighttexture = new Texture(); skyrighttexture = new Texture();
skyrighttexture->loadImage(SKYRIGHT); skyrighttexture->loadImage(SKYRIGHT);
skytoptexture = new Texture(); skytoptexture = new Texture();
skytoptexture->loadImage(SKYTOP); skytoptexture->loadImage(SKYTOP);
skybottomtexture = new Texture(); skybottomtexture = new Texture();
skybottomtexture->loadImage(SKYBOTTOM); skybottomtexture->loadImage(SKYBOTTOM);
float something[3] = {1, 0, 0.5};
damageHead = new Texture();
damageHead->loadImage(DAMAGEHEAD, something);
damageTorso = new Texture();
damageTorso->loadImage(DAMAGETORSO, something);
damageHand = new Texture();
damageHand->loadImage(DAMAGEHAND, something);
damageLeg = new Texture();
damageLeg->loadImage(DAMAGELEG, something);
faceTexture = new Texture();
something[2] = 1;
faceTexture->loadImage(FACE, something);
float something[3] = {1, 0, 0.5}; float zeros[3] = {0, 0, 0};
damageHead = new Texture(); flaretexture = new Texture();
damageHead->loadImage(DAMAGEHEAD, something); flaretexture->loadImage(DATAPATH "flare.png", zeros);
damageTorso = new Texture();
damageTorso->loadImage(DAMAGETORSO, something);
damageHand = new Texture();
damageHand->loadImage(DAMAGEHAND, something);
damageLeg = new Texture();
damageLeg->loadImage(DAMAGELEG, something);
faceTexture = new Texture();
something[2] = 1;
faceTexture->loadImage(FACE, something);
float zeros[3] = {0, 0, 0}; float pink[3] = {1, 0, 1};
flaretexture = new Texture(); tuxtexture = new Texture();
flaretexture->loadImage(DATAPATH"flare.png", zeros); tuxtexture->loadImage(DATAPATH "tux.png", pink);
} else {
skyfronttexture->reload();
skybacktexture->reload();
skylefttexture->reload();
skyrighttexture->reload();
skytoptexture->reload();
skybottomtexture->reload();
damageHead->reload();
damageTorso->reload();
damageHand->reload();
damageLeg->reload();
float pink[3] = {1, 0, 1}; flaretexture->reload();
tuxtexture = new Texture();
tuxtexture->loadImage(DATAPATH"tux.png", pink);
} else{
skyfronttexture->reload();
skybacktexture->reload();
skylefttexture->reload();
skyrighttexture->reload();
skytoptexture->reload();
skybottomtexture->reload();
damageHead->reload(); tuxtexture->reload();
damageTorso->reload(); }
damageHand->reload(); texturesloaded = true;
damageLeg->reload();
flaretexture->reload();
tuxtexture->reload();
}
texturesloaded = true;
} }
void setDetail(int detail){ void setDetail(int detail) {
switch(detail){ switch (detail) {
case 0: case 0:
knobdetail = 0; knobdetail = 0;
break; break;
case 1: case 1:
knobdetail = 5; knobdetail = 5;
break; break;
case 2: case 2:
knobdetail = 8; knobdetail = 8;
break; break;
case 3: case 3:
knobdetail = 16; knobdetail = 16;
break; break;
} }
initKnob(); initKnob();
} }

1
src/run.h
View file

@ -13,4 +13,3 @@ void initTextures(void);
void setDetail(int detail); void setDetail(int detail);
#endif #endif

20
src/shape.cpp
View file

@ -1,18 +1,8 @@
#include "shape.h" #include "shape.h"
Shape::Shape(Object *object){ Shape::Shape(Object *object) { this->object = object; }
this->object = object;
}
bool Shape::checkCollision(Object *target){ bool Shape::checkCollision(Object *target) { return false; }
return false; bool Shape::checkCollisionPeer(Shape *target) { return false; }
} bool Shape::checkCollisionPeer(SphereShape *target) { return false; }
bool Shape::checkCollisionPeer(Shape *target){ bool Shape::checkCollisionPeer(MeshShape *target) { return false; }
return false;
}
bool Shape::checkCollisionPeer(SphereShape *target){
return false;
}
bool Shape::checkCollisionPeer(MeshShape *target){
return false;
}

18
src/shape.h
View file

@ -10,22 +10,20 @@ class MeshShape;
/* /*
* Abstract class for object geometry * Abstract class for object geometry
*/ */
class Shape{ class Shape {
protected: protected:
Object *object; Object *object;
public: public:
Shape(Object *object); Shape(Object *object);
virtual float calculateMomentOfInertia(float *rotationvector) = 0;
virtual float calculateMomentOfInertia(float *rotationvector) = 0; virtual bool checkCollision(Object *target);
virtual bool checkCollision(Object *target); virtual bool checkCollisionPeer(Shape *target);
virtual bool checkCollisionPeer(SphereShape *target);
virtual bool checkCollisionPeer(Shape *target); virtual bool checkCollisionPeer(MeshShape *target);
virtual bool checkCollisionPeer(SphereShape *target);
virtual bool checkCollisionPeer(MeshShape *target);
}; };
#endif #endif

169
src/sphere.cpp
View file

@ -10,60 +10,50 @@
#include "collision.h" #include "collision.h"
#include "glapi.h" #include "glapi.h"
Sphere::Sphere(void) {
Sphere::Sphere(void){ appearance = new SphereAppearance();
appearance = new SphereAppearance(); Object::appearance = appearance;
Object::appearance = appearance; geometry = new SphereShape(this);
geometry = new SphereShape(this); Object::geometry = geometry;
Object::geometry = geometry;
} }
void Sphere::setRadius(float r){ void Sphere::setRadius(float r) {
if (r < 0) r = -r; if (r < 0)
this->r = r; r = -r;
appearance->setRadius(r); this->r = r;
geometry->setRadius(r); appearance->setRadius(r);
geometry->setRadius(r);
} }
SphereAppearance::SphereAppearance(void){ SphereAppearance::SphereAppearance(void) { setRadius(1); }
setRadius(1);
void SphereAppearance::setRadius(float r) {
if (r < 0)
r = -r;
this->r = r;
} }
void SphereAppearance::setRadius(float r){ void Sphere::setColor(float red, float green, float blue) {
if (r < 0) r = -r; appearance->getMaterial()->setColor(red, green, blue, 1);
this->r = r;
} }
void Sphere::setColor(float red, float green, float blue){ void SphereAppearance::draw(void) {
appearance->getMaterial()->setColor(red, green, blue, 1); material.enable();
createSphere(r);
} }
void SphereAppearance::draw(void){ SphereShape::SphereShape(Object *sphere) : Shape(sphere) { setRadius(1); }
material.enable();
createSphere(r); void SphereShape::setRadius(float r) { this->r = r; }
float SphereShape::getRadius(void) { return r; }
bool SphereShape::checkCollision(Object *target) {
return target->geometry->checkCollisionPeer(this);
} }
float SphereShape::calculateMomentOfInertia(float *rotationvector) {
return 2.0 / 3.0 * r * r;
SphereShape::SphereShape(Object *sphere) : Shape(sphere){
setRadius(1);
}
void SphereShape::setRadius(float r){
this->r = r;
}
float SphereShape::getRadius(void){
return r;
}
bool SphereShape::checkCollision(Object *target){
return target->geometry->checkCollisionPeer(this);
}
float SphereShape::calculateMomentOfInertia(float *rotationvector){
return 2.0/3.0*r*r;
} }
/*bool SphereShape::checkCollisionPeer(PlaneShape *target){ /*bool SphereShape::checkCollisionPeer(PlaneShape *target){
@ -84,46 +74,47 @@ float SphereShape::calculateMomentOfInertia(float *rotationvector){
return false; return false;
}*/ }*/
bool SphereShape::checkCollisionPeer(SphereShape *target){ bool SphereShape::checkCollisionPeer(SphereShape *target) {
/*float sourceposition[3], targetposition[3]; /*float sourceposition[3], targetposition[3];
object->getPosition(sourceposition); object->getPosition(sourceposition);
target->object->getPosition(targetposition); target->object->getPosition(targetposition);
float impact[3]; float impact[3];
vectorSub(impact, sourceposition, targetposition);*/ vectorSub(impact, sourceposition, targetposition);*/
float impact[3] = {0, 0, 0}; float impact[3] = {0, 0, 0};
object->transformPoint(impact, impact); object->transformPoint(impact, impact);
target->object->unTransformPoint(impact, impact); target->object->unTransformPoint(impact, impact);
float distance2 = vectorDot(impact, impact); float distance2 = vectorDot(impact, impact);
if (distance2 < (r + target->r)*(r + target->r)){ if (distance2 < (r + target->r) * (r + target->r)) {
/*float temp[3], temp2[3], temp3[3]; /*float temp[3], temp2[3], temp3[3];
object->getMomentum(temp2); object->getMomentum(temp2);
target->object->getMomentum(temp3); target->object->getMomentum(temp3);
vectorSub(temp, temp2, temp3); vectorSub(temp, temp2, temp3);
shotsound->setVolume(1.0-1/(1+vectorLength(temp)*0.5)); shotsound->setVolume(1.0-1/(1+vectorLength(temp)*0.5));
shotsound->play();*/ shotsound->play();*/
float normal[3]; float normal[3];
vectorNormalize(normal, impact); vectorNormalize(normal, impact);
float contactpoint[3]; float contactpoint[3];
vectorScale(contactpoint, normal, target->r); vectorScale(contactpoint, normal, target->r);
target->object->transformVector(normal, normal); target->object->transformVector(normal, normal);
target->object->transformPoint(contactpoint, contactpoint); target->object->transformPoint(contactpoint, contactpoint);
addCollision(object, target->object, normal, contactpoint); addCollision(object, target->object, normal, contactpoint);
//vectorAdd(contactnormal, normal); // vectorAdd(contactnormal, normal);
return true; return true;
} }
return false; return false;
} }
bool between(float x, float x1, float x2){ bool between(float x, float x1, float x2) {
if ((x >= x1 && x <=x2) || (x >= x2 && x <=x1)) return true; if ((x >= x1 && x <= x2) || (x >= x2 && x <= x1))
return false; return true;
return false;
} }
/*bool SphereShape::checkCollisionPeer(BoxShape *target){ /*bool SphereShape::checkCollisionPeer(BoxShape *target){
@ -238,26 +229,24 @@ bool between(float x, float x1, float x2){
return false; return false;
}*/ }*/
bool SphereShape::checkCollisionPeer(MeshShape *target) {
float position[3] = {0, 0, 0};
object->transformPoint(position, position);
target->object->unTransformPoint(position, position);
Mesh *mesh = target->mesh;
float normal[3];
float contactpoint[3];
bool SphereShape::checkCollisionPeer(MeshShape *target){ if (checkSphereMeshCollision(position, r, mesh, normal, contactpoint)) {
float position[3] = {0, 0, 0}; target->object->transformVector(normal, normal);
object->transformPoint(position, position); target->object->transformPoint(contactpoint, contactpoint);
target->object->unTransformPoint(position, position);
Mesh *mesh = target->mesh;
float normal[3]; addCollision(object, target->object, normal, contactpoint);
float contactpoint[3];
if (checkSphereMeshCollision(position, r, mesh, normal, contactpoint)){ // vectorAdd(contactnormal, normal);
target->object->transformVector(normal, normal);
target->object->transformPoint(contactpoint, contactpoint);
addCollision(object, target->object, normal, contactpoint); return true;
}
//vectorAdd(contactnormal, normal); return false;
return true;
}
return false;
} }

58
src/sphere.h
View file

@ -5,63 +5,57 @@
#include "material.h" #include "material.h"
#include "mesh.h" #include "mesh.h"
class SphereAppearance; class SphereAppearance;
//Object for sphere // Object for sphere
class Sphere : public Object{ class Sphere : public Object {
private: private:
float r; float r;
SphereAppearance *appearance; SphereAppearance *appearance;
SphereShape *geometry; SphereShape *geometry;
public: public:
Sphere(void); Sphere(void);
void setRadius(float r); void setRadius(float r);
void setColor(float red, float green, float blue); void setColor(float red, float green, float blue);
}; };
// Appearance of sphere
class SphereAppearance : public Appearance {
//Appearance of sphere
class SphereAppearance : public Appearance{
private: private:
float r; float r;
public: public:
SphereAppearance(void); SphereAppearance(void);
void setRadius(float r); void setRadius(float r);
void draw(void); void draw(void);
}; };
// Geometry of sphere
class SphereShape : public Shape {
//Geometry of sphere
class SphereShape : public Shape{
private: private:
float r; float r;
public: public:
SphereShape(Object *sphere); SphereShape(Object *sphere);
void setRadius(float r); void setRadius(float r);
float getRadius(void); float getRadius(void);
float calculateMomentOfInertia(float *rotationvector); float calculateMomentOfInertia(float *rotationvector);
bool checkCollision(Object *target); bool checkCollision(Object *target);
bool checkCollisionPeer(SphereShape *target); bool checkCollisionPeer(SphereShape *target);
bool checkCollisionPeer(MeshShape *target); bool checkCollisionPeer(MeshShape *target);
friend class Sphere; friend class Sphere;
friend class MeshShape; friend class MeshShape;
}; };
#endif #endif

68
src/texture.cpp
View file

@ -1,57 +1,55 @@
#include "texture.h" #include "texture.h"
#include "graphics.h" #include "graphics.h"
Texture::Texture(void){ Texture::Texture(void) {
this->textureId = -1; this->textureId = -1;
this->enabled = false; this->enabled = false;
} }
Texture::~Texture(void){ Texture::~Texture(void) {
if (textureId != -1){ if (textureId != -1) {
DRUID.freeTexture(textureId); DRUID.freeTexture(textureId);
textureId = -1; textureId = -1;
enabled = false; enabled = false;
} }
} }
Texture::Texture(int id){ Texture::Texture(int id) {
if (id > -1){ if (id > -1) {
this->textureId = id; this->textureId = id;
this->enabled = false; this->enabled = false;
} } else {
else{
this->textureId = -1; this->textureId = -1;
this->enabled = false; this->enabled = false;
} }
} }
bool Texture::loadImage(char* path){ bool Texture::loadImage(char *path) {
format = GL_RGB; format = GL_RGB;
texture = IMG_Load(path); texture = IMG_Load(path);
//texture = SDL_DisplayFormatAlpha(texture); // texture = SDL_DisplayFormatAlpha(texture);
this->textureId = DRUID.loadTexture(texture, -1); this->textureId = DRUID.loadTexture(texture, -1);
//this->textureId = DRUID.loadTexture(path, -1); // this->textureId = DRUID.loadTexture(path, -1);
this->enable(); this->enable();
return this->isValidId(); return this->isValidId();
} }
bool Texture::loadImage(char* path, float *trans){ bool Texture::loadImage(char *path, float *trans) {
format = GL_RGBA; format = GL_RGBA;
texture = IMG_Load(path); texture = IMG_Load(path);
Uint32 colorKey = SDL_MapRGB(texture->format, Uint32 colorKey =
(Uint8)(trans[0] * 255), SDL_MapRGB(texture->format, (Uint8)(trans[0] * 255),
(Uint8)(trans[1] * 255), (Uint8)(trans[1] * 255), (Uint8)(trans[2] * 255));
(Uint8)(trans[2] * 255)); // SDL_SetAlpha(texture, 0, SDL_ALPHA_OPAQUE);
//SDL_SetAlpha(texture, 0, SDL_ALPHA_OPAQUE);
SDL_SetColorKey(texture, SDL_SRCCOLORKEY, colorKey); SDL_SetColorKey(texture, SDL_SRCCOLORKEY, colorKey);
//SDL_Surface* alphaSurface = SDL_DisplayFormatAlpha(texture); // SDL_Surface* alphaSurface = SDL_DisplayFormatAlpha(texture);
texture = SDL_DisplayFormatAlpha(texture); texture = SDL_DisplayFormatAlpha(texture);
this->textureId = DRUID.loadTexture(texture, -1, format); this->textureId = DRUID.loadTexture(texture, -1, format);
@ -59,39 +57,33 @@ bool Texture::loadImage(char* path, float *trans){
return this->isValidId(); return this->isValidId();
} }
void Texture::reload(void){ void Texture::reload(void) {
this->textureId = DRUID.loadTexture(texture, -1, format); this->textureId = DRUID.loadTexture(texture, -1, format);
this->enable(); this->enable();
} }
void Texture::disable(void){ void Texture::disable(void) {
this->enabled = false; this->enabled = false;
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
} }
void Texture::enable(void){ void Texture::enable(void) {
if (textureId > -1){ if (textureId > -1) {
this->enabled = true; this->enabled = true;
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, textureId); glBindTexture(GL_TEXTURE_2D, textureId);
} }
} }
bool Texture::isEnabled(void){ bool Texture::isEnabled(void) { return this->enabled; }
return this->enabled;
}
int Texture::getId(void){ int Texture::getId(void) { return this->textureId; }
return this->textureId;
}
void Texture::setId(int id){ void Texture::setId(int id) {
if (id > -1){ if (id > -1) {
this->textureId = id; this->textureId = id;
this->enable(); this->enable();
} }
} }
bool Texture::isValidId(void){ bool Texture::isValidId(void) { return (this->textureId > -1); }
return (this->textureId > -1);
}

21
src/texture.h
View file

@ -3,36 +3,33 @@
#include <SDL_image.h> #include <SDL_image.h>
#include "main.h" #include "main.h"
class Texture{ class Texture {
public: public:
Texture(void); Texture(void);
Texture(int id); Texture(int id);
~Texture(void); ~Texture(void);
bool loadImage(char* path); bool loadImage(char *path);
bool loadImage(char* path, float *trans); bool loadImage(char *path, float *trans);
void enable(void); void enable(void);
void disable(void); void disable(void);
bool isEnabled(void); bool isEnabled(void);
int getId(void); int getId(void);
void setId(int id); void setId(int id);
bool isValidId(void); bool isValidId(void);
void reload(void); void reload(void);
//int* getOGLTexture(void); // int* getOGLTexture(void);
//int* getModifiableOGLTexture(void); // int* getModifiableOGLTexture(void);
private: private:
int textureId; int textureId;
//int* modTexture; // int* modTexture;
bool enabled; bool enabled;
SDL_Surface *texture; SDL_Surface *texture;
int format; int format;
}; };
#endif #endif

54
src/utils.cpp
View file

@ -1,39 +1,37 @@
#include <stdlib.h> #include <stdlib.h>
void swapInt(int *a, int *b){ void swapInt(int *a, int *b) {
int temp = *a; int temp = *a;
*a = *b; *a = *b;
*b = temp; *b = temp;
} }
void swapFloat(float *a, float *b){ void swapFloat(float *a, float *b) {
float temp = *a; float temp = *a;
*a = *b; *a = *b;
*b = temp; *b = temp;
} }
int random(int x){ int random(int x) { return rand() * x / RAND_MAX; }
return rand() * x / RAND_MAX;
float randomf(float x) { return rand() * x / RAND_MAX; }
int smod(int val, int mod) {
if (val >= 0)
return val % mod;
int temp = -val / mod + 1;
return (val + temp * mod) % mod;
} }
float randomf(float x){ double sdes(double val) {
return rand() * x / RAND_MAX; if (val >= 0)
return val - (int)(val);
return val - (int)(val) + 1;
} }
int smod(int val, int mod){ double sfmod(double val, double mod) {
if (val>=0) return val%mod; val -= (int)(val / mod) * mod;
int temp=-val/mod+1; if (val < 0)
return (val+temp*mod)%mod; val += mod;
return val;
} }
double sdes(double val){
if (val>=0) return val-(int)(val);
return val-(int)(val)+1;
}
double sfmod(double val, double mod){
val-=(int)(val/mod)*mod;
if (val<0) val+=mod;
return val;
}

2
src/utils.h
View file

@ -1,7 +1,6 @@
#ifndef __UTILS_H_INCLUDED__ #ifndef __UTILS_H_INCLUDED__
#define __UTILS_H_INCLUDED__ #define __UTILS_H_INCLUDED__
#define PI 3.14159265358979323846 #define PI 3.14159265358979323846
void swapInt(int *a, int *b); void swapInt(int *a, int *b);
@ -13,4 +12,3 @@ double sdes(double val);
double sfmod(double val, double mod); double sfmod(double val, double mod);
#endif #endif

399
src/vector.cpp
View file

@ -4,223 +4,222 @@
#include "vector.h" #include "vector.h"
#include "utils.h" #include "utils.h"
void vectorSet(float *target, float x, float y, float z){ void vectorSet(float *target, float x, float y, float z) {
target[0] = x; target[0] = x;
target[1] = y; target[1] = y;
target[2] = z; target[2] = z;
} }
void vectorCopy(float *target, float *source){ void vectorCopy(float *target, float *source) {
target[0] = source[0]; target[0] = source[0];
target[1] = source[1]; target[1] = source[1];
target[2] = source[2]; target[2] = source[2];
} }
void vectorAdd(float *target, float *source1, float *source2){ void vectorAdd(float *target, float *source1, float *source2) {
target[0] = source1[0] + source2[0]; target[0] = source1[0] + source2[0];
target[1] = source1[1] + source2[1]; target[1] = source1[1] + source2[1];
target[2] = source1[2] + source2[2]; target[2] = source1[2] + source2[2];
} }
void vectorAdd(float *target, float *source){ void vectorAdd(float *target, float *source) {
target[0] += source[0]; target[0] += source[0];
target[1] += source[1]; target[1] += source[1];
target[2] += source[2]; target[2] += source[2];
} }
void vectorSub(float *target, float *source1, float *source2){ void vectorSub(float *target, float *source1, float *source2) {
target[0] = source1[0] - source2[0]; target[0] = source1[0] - source2[0];
target[1] = source1[1] - source2[1]; target[1] = source1[1] - source2[1];
target[2] = source1[2] - source2[2]; target[2] = source1[2] - source2[2];
} }
void vectorSub(float *target, float *source){ void vectorSub(float *target, float *source) {
target[0] -= source[0]; target[0] -= source[0];
target[1] -= source[1]; target[1] -= source[1];
target[2] -= source[2]; target[2] -= source[2];
} }
void vectorNegative(float *target, float *source){ void vectorNegative(float *target, float *source) {
target[0] = -source[0]; target[0] = -source[0];
target[1] = -source[1]; target[1] = -source[1];
target[2] = -source[2]; target[2] = -source[2];
} }
void vectorNegative(float *target){ void vectorNegative(float *target) {
target[0] = -target[0]; target[0] = -target[0];
target[1] = -target[1]; target[1] = -target[1];
target[2] = -target[2]; target[2] = -target[2];
} }
void vectorScale(float *target, float *source, float scale){ void vectorScale(float *target, float *source, float scale) {
target[0] = source[0] * scale; target[0] = source[0] * scale;
target[1] = source[1] * scale; target[1] = source[1] * scale;
target[2] = source[2] * scale; target[2] = source[2] * scale;
} }
void vectorScale(float *target, float scale){ void vectorScale(float *target, float scale) {
target[0] *= scale; target[0] *= scale;
target[1] *= scale; target[1] *= scale;
target[2] *= scale; target[2] *= scale;
} }
float vectorDot(float *source1, float *source2){ float vectorDot(float *source1, float *source2) {
return source1[0]*source2[0] + source1[1]*source2[1] + source1[2]*source2[2]; return source1[0] * source2[0] + source1[1] * source2[1] +
source1[2] * source2[2];
} }
float vectorNormalizedDot(float *source1, float *source2){ float vectorNormalizedDot(float *source1, float *source2) {
return vectorDot(source1, source2) / (vectorLength(source1) * vectorLength(source2)); return vectorDot(source1, source2) /
(vectorLength(source1) * vectorLength(source2));
} }
float vectorLength(float *source){ float vectorLength(float *source) { return sqrtf(vectorDot(source, source)); }
return sqrtf(vectorDot(source, source));
void vectorCross(float *target, float *source1, float *source2) {
target[0] = source1[1] * source2[2] - source1[2] * source2[1];
target[1] = source1[2] * source2[0] - source1[0] * source2[2];
target[2] = source1[0] * source2[1] - source1[1] * source2[0];
} }
void vectorCross(float *target, float *source1, float *source2){ void vectorNormalize(float *target, float *source) {
target[0] = source1[1]*source2[2] - source1[2]*source2[1]; vectorScale(target, source, 1.0 / vectorLength(source));
target[1] = source1[2]*source2[0] - source1[0]*source2[2];
target[2] = source1[0]*source2[1] - source1[1]*source2[0];
} }
void vectorNormalize(float *target, float *source){ void vectorNormalize(float *target) {
vectorScale(target, source, 1.0/vectorLength(source)); vectorScale(target, 1.0 / vectorLength(target));
} }
void vectorNormalize(float *target){ void vectorReflect(float *target, float *source, float *normal) {
vectorScale(target, 1.0/vectorLength(target)); vectorCopy(target, normal);
vectorScale(target, -vectorDot(source, normal) * 2);
vectorAdd(target, source);
} }
void vectorReflect(float *target, float *source, float *normal){ void vectorProject(float *target, float *source1, float *source2) {
vectorCopy(target, normal); vectorScale(target, source2,
vectorScale(target, -vectorDot(source, normal)*2); vectorDot(source1, source2) / vectorDot(source2, source2));
vectorAdd(target, source);
} }
void vectorProject(float *target, float *source1, float *source2){ bool vectorIsZero(float *vector) {
vectorScale(target, source2, vectorDot(source1, source2) / vectorDot(source2, source2)); if (vector[0] == 0 && vector[1] == 0 && vector[2] == 0)
return true;
// if (vectorDot(vector, vector) < 0.00001) return true;
else
return false;
} }
bool vectorIsZero(float *vector){ void vectorSaturate(float *target, float *source, float min, float max) {
if (vector[0] == 0 && vector[1] == 0 && vector[2] == 0) return true; float len = vectorLength(source);
//if (vectorDot(vector, vector) < 0.00001) return true; if (len < min) {
else return false; len = min;
} else if (len > max) {
len = max;
} else {
if (target != source)
vectorCopy(target, source);
return;
}
vectorNormalize(target, source);
vectorScale(target, len);
} }
void vectorSaturate(float *target, float *source, float min, float max){ void vectorSaturate(float *vector, float min, float max) {
float len = vectorLength(source); vectorSaturate(vector, vector, min, max);
if (len < min){ }
len = min;
} else if (len > max){ void vectorMatrixMultiply(float *target, float *source, float *matrix) {
len = max; float source2[3];
} else{ if (source == target) {
if (target != source) vectorCopy(target, source); vectorCopy(source2, source);
return; source = source2;
} }
vectorNormalize(target, source); int x;
vectorScale(target, len); for (x = 0; x < 3; x++) {
} target[x] = source[0] * matrix[0 + x] + source[1] * matrix[3 + x] +
source[2] * matrix[6 + x];
void vectorSaturate(float *vector, float min, float max){ }
vectorSaturate(vector, vector, min, max); }
}
void matrixSet(float *matrix, float x1, float y1, float z1, float x2, float y2,
void vectorMatrixMultiply(float *target, float *source, float *matrix){ float z2, float x3, float y3, float z3) {
float source2[3]; matrix[0] = x1;
if (source == target){ matrix[1] = y1;
vectorCopy(source2, source); matrix[2] = z1;
source = source2; matrix[3] = x2;
} matrix[4] = y2;
int x; matrix[5] = z2;
for (x = 0; x < 3; x++){ matrix[6] = x3;
target[x] = source[0]*matrix[0+x] + matrix[7] = y3;
source[1]*matrix[3+x] + matrix[8] = z3;
source[2]*matrix[6+x]; }
}
} void matrixSet(float *matrix, float *r1, float *r2, float *r3) {
vectorCopy(&matrix[0], r1);
vectorCopy(&matrix[3], r2);
vectorCopy(&matrix[6], r3);
void matrixSet(float *matrix, }
float x1, float y1, float z1,
float x2, float y2, float z2, void matrixCopy(float *target, float *source) {
float x3, float y3, float z3){ target[0] = source[0];
matrix[0] = x1; target[1] = source[1];
matrix[1] = y1; target[2] = source[2];
matrix[2] = z1; target[3] = source[3];
matrix[3] = x2; target[4] = source[4];
matrix[4] = y2; target[5] = source[5];
matrix[5] = z2; target[6] = source[6];
matrix[6] = x3; target[7] = source[7];
matrix[7] = y3; target[8] = source[8];
matrix[8] = z3; }
}
void matrixIdentity(float *matrix) {
void matrixSet(float *matrix, float *r1, float *r2, float *r3){ matrixSet(matrix, 1, 0, 0, 0, 1, 0, 0, 0, 1);
vectorCopy(&matrix[0], r1); }
vectorCopy(&matrix[3], r2);
vectorCopy(&matrix[6], r3); void matrixAdd(float *target, float *source1, float *source2) {
} target[0] = source1[0] + source2[0];
target[1] = source1[1] + source2[1];
void matrixCopy(float *target, float *source){ target[2] = source1[2] + source2[2];
target[0] = source[0]; target[3] = source1[3] + source2[3];
target[1] = source[1]; target[4] = source1[4] + source2[4];
target[2] = source[2]; target[5] = source1[5] + source2[5];
target[3] = source[3]; target[6] = source1[6] + source2[6];
target[4] = source[4]; target[7] = source1[7] + source2[7];
target[5] = source[5]; target[8] = source1[8] + source2[8];
target[6] = source[6]; }
target[7] = source[7];
target[8] = source[8]; void matrixAdd(float *target, float *source) {
} target[0] += source[0];
target[1] += source[1];
void matrixIdentity(float *matrix){ target[2] += source[2];
matrixSet(matrix, 1, 0, 0, 0, 1, 0, 0, 0, 1); target[3] += source[3];
} target[4] += source[4];
target[5] += source[5];
void matrixAdd(float *target, float *source1, float *source2){ target[6] += source[6];
target[0] = source1[0] + source2[0]; target[7] += source[7];
target[1] = source1[1] + source2[1]; target[8] += source[8];
target[2] = source1[2] + source2[2]; }
target[3] = source1[3] + source2[3];
target[4] = source1[4] + source2[4]; void matrixMultiply(float *target, float *source1, float *source2) {
target[5] = source1[5] + source2[5]; float target2[9];
target[6] = source1[6] + source2[6]; float *oldtarget = target;
target[7] = source1[7] + source2[7]; bool copy = false;
target[8] = source1[8] + source2[8]; if (source1 == target || source2 == target) {
} copy = true;
target = target2;
void matrixAdd(float *target, float *source){ }
target[0] += source[0]; int x, y;
target[1] += source[1]; for (y = 0; y < 3; y++) {
target[2] += source[2]; for (x = 0; x < 3; x++) {
target[3] += source[3]; *target = source1[y * 3 + 0] * source2[x] +
target[4] += source[4]; source1[y * 3 + 1] * source2[3 + x] +
target[5] += source[5]; source1[y * 3 + 2] * source2[6 + x];
target[6] += source[6]; target++;
target[7] += source[7];
target[8] += source[8];
}
void matrixMultiply(float *target, float *source1, float *source2){
float target2[9];
float *oldtarget = target;
bool copy = false;
if (source1 == target || source2 == target){
copy = true;
target = target2;
}
int x, y;
for (y = 0; y < 3; y++){
for (x = 0; x < 3; x++){
*target = source1[y*3+0]*source2[x] +
source1[y*3+1]*source2[3+x] +
source1[y*3+2]*source2[6+x];
target++;
}
}
if (copy){
matrixCopy(oldtarget, target2);
} }
}
if (copy) {
matrixCopy(oldtarget, target2);
}
} }
/*void matrixMultiply(float *target, float *source){ /*void matrixMultiply(float *target, float *source){
@ -233,33 +232,36 @@ void matrixMultiply(float *target, float *source1, float *source2){
matrixMultiply(matrix, matrix, rotmat); matrixMultiply(matrix, matrix, rotmat);
}*/ }*/
void matrixCreateRotation(float *matrix, float *vector){ void matrixCreateRotation(float *matrix, float *vector) {
float angle = vectorLength(vector); float angle = vectorLength(vector);
float n[3]; float n[3];
vectorNormalize(n, vector); vectorNormalize(n, vector);
float c = cos(angle); float c = cos(angle);
float s = sin(angle); float s = sin(angle);
float t = 1 - c; float t = 1 - c;
float x = n[0]; float x = n[0];
float y = n[1]; float y = n[1];
float z = n[2]; float z = n[2];
matrixSet(matrix,
t*x*x + c, t*y*x + s*z, t*z*x - s*y,
t*x*y - s*z, t*y*y + c, t*z*y + s*x,
t*x*z + s*y, t*y*z - s*x, t*z*z + c);
matrixSet(matrix, t * x * x + c, t * y * x + s * z, t * z * x - s * y,
t * x * y - s * z, t * y * y + c, t * z * y + s * x,
t * x * z + s * y, t * y * z - s * x, t * z * z + c);
} }
void matrixTranspose(float *target, float *source){ void matrixTranspose(float *target, float *source) {
target[0] = source[0]; target[1] = source[3]; target[2] = source[6]; target[0] = source[0];
target[3] = source[1]; target[4] = source[4]; target[5] = source[7]; target[1] = source[3];
target[6] = source[2]; target[7] = source[5]; target[8] = source[8]; target[2] = source[6];
target[3] = source[1];
target[4] = source[4];
target[5] = source[7];
target[6] = source[2];
target[7] = source[5];
target[8] = source[8];
} }
/*void rotatePointAroundVector(float *target, float *point, float *vector){ /*void rotatePointAroundVector(float *target, float *point, float *vector){
float angle = vectorLength(vector); float angle = vectorLength(vector);
float n[3]; float n[3];
@ -271,4 +273,3 @@ void matrixTranspose(float *target, float *source){
//r' = r*c + n*(n . r)*t + (r x n)*s //r' = r*c + n*(n . r)*t + (r x n)*s
}*/ }*/

13
src/vector.h
View file

@ -24,27 +24,22 @@ bool vectorIsZero(float *vector);
void vectorSaturate(float *target, float *source, float min, float max); void vectorSaturate(float *target, float *source, float min, float max);
void vectorSaturate(float *vector, float min, float max); void vectorSaturate(float *vector, float min, float max);
//Projects vector source1 onto vector source2 // Projects vector source1 onto vector source2
void vectorProject(float *target, float *source1, float *source2); void vectorProject(float *target, float *source1, float *source2);
void vectorMatrixMultiply(float *target, float *source, float *matrix); void vectorMatrixMultiply(float *target, float *source, float *matrix);
void matrixSet(float *matrix, float x1, float y1, float z1, float x2, float y2,
float z2, float x3, float y3, float z3);
void matrixSet(float *matrix,
float x1, float y1, float z1,
float x2, float y2, float z2,
float x3, float y3, float z3);
void matrixSet(float *matrix, float *r1, float *r2, float *r3); void matrixSet(float *matrix, float *r1, float *r2, float *r3);
void matrixCopy(float *target, float *source); void matrixCopy(float *target, float *source);
void matrixIdentity(float *matrix); void matrixIdentity(float *matrix);
void matrixAdd(float *target, float *source1, float *source2); void matrixAdd(float *target, float *source1, float *source2);
void matrixAdd(float *target, float *source); void matrixAdd(float *target, float *source);
void matrixMultiply(float *target, float *source1, float *source2); void matrixMultiply(float *target, float *source1, float *source2);
//void matrixMultiply(float *target, float *source); // void matrixMultiply(float *target, float *source);
void matrixRotate(float *matrix, float *vector); void matrixRotate(float *matrix, float *vector);
void matrixCreateRotation(float *matrix, float *vector); void matrixCreateRotation(float *matrix, float *vector);
void matrixTranspose(float *target, float *source); void matrixTranspose(float *target, float *source);
#endif #endif

340
src/world.cpp
View file

@ -4,208 +4,206 @@
#include "collision.h" #include "collision.h"
#include "vector.h" #include "vector.h"
World::World(void){ World::World(void) {
childlist = NULL; childlist = NULL;
linklist = NULL; linklist = NULL;
maxparticles = 500; maxparticles = 500;
particles = new Particle *[maxparticles]; particles = new Particle *[maxparticles];
particlecount = 0; particlecount = 0;
} }
void World::prepare(void){ void World::prepare(void) {
objectlist *node = childlist; objectlist *node = childlist;
childcount = 0; childcount = 0;
while (node != NULL){ while (node != NULL) {
Object *child = node->object; Object *child = node->object;
child->prepare(); child->prepare();
node = node->next; node = node->next;
childcount++; childcount++;
} }
childs = new Object *[childcount]; childs = new Object *[childcount];
node = childlist; node = childlist;
int i = 0; int i = 0;
while (node != NULL){ while (node != NULL) {
Object *child = node->object; Object *child = node->object;
childs[i] = child; childs[i] = child;
node = node->next; node = node->next;
i++; i++;
} }
contacts = new Contact[MAXCONTACTS];//childcount*childcount]; contacts = new Contact[MAXCONTACTS]; // childcount*childcount];
} }
#define GRAVITY 9.81 #define GRAVITY 9.81
//#define GRAVITY 15 //#define GRAVITY 15
void World::move(void){ void World::move(void) {
int i, j; int i, j;
// Gravity
float gravity[3];
vectorSet(gravity, 0, 0, 0);
for (i = 0; i < childcount; i++) {
Object *object = childs[i];
if (object->gravity) {
gravity[1] = -object->getMass() * GRAVITY;
object->addExternalForce(gravity);
}
}
//Gravity /*for (i = 0; i < particlecount; i++){
float gravity[3]; Particle *object = particles[i];
vectorSet(gravity, 0, 0, 0); if (object->gravity){
for (i = 0; i < childcount; i++){ gravity[1] = -object->getMass()*GRAVITY;
Object *object = childs[i]; object->addExternalForce(gravity);
if (object->gravity){ }
gravity[1] = -object->getMass()*GRAVITY; }*/
object->addExternalForce(gravity);
} // Collisions
contactcount = 0;
for (i = 0; i < childcount; i++) {
Object *object1 = childs[i];
int group1 = object1->getCollisionGroup();
for (j = i + 1; j < childcount; j++) {
Object *object2 = childs[j];
int group2 = object2->getCollisionGroup();
if (isCollisionLink(group1, group2)) {
object2->geometry->checkCollision(object1);
}
}
}
/*for (i = 0; i < particlecount; i++){
Particle *object1 = particles[i];
int group1 = object1->getCollisionGroup();
for (j = 0; j < childcount; j++){
Object *object2 = childs[j];
int group2 = object2->getCollisionGroup();
if (isCollisionLink(group1, group2)){
object2->geometry->checkCollision(object1);
}
}
}*/
// printf("Contacts: %i\n", contactcount);
bool contactresponse;
j = 0;
do {
contactresponse = false;
// Links between objects
objectlinklist *node = linklist;
while (node != NULL) {
ObjectLink *link = node->link;
if (handleLink(link))
contactresponse = true;
node = node->next;
} }
/*for (i = 0; i < particlecount; i++){ // Collision contact
Particle *object = particles[i]; for (i = 0; i < contactcount; i++) {
if (object->gravity){ Contact *contact = &contacts[i];
gravity[1] = -object->getMass()*GRAVITY; if (handleCollision(contact))
object->addExternalForce(gravity); contactresponse = true;
}
}*/
//Collisions
contactcount = 0;
for (i = 0; i < childcount; i++){
Object *object1 = childs[i];
int group1 = object1->getCollisionGroup();
for (j = i+1; j < childcount; j++){
Object *object2 = childs[j];
int group2 = object2->getCollisionGroup();
if (isCollisionLink(group1, group2)){
object2->geometry->checkCollision(object1);
}
}
} }
/*for (i = 0; i < particlecount; i++){ j++;
Particle *object1 = particles[i]; } while (contactresponse && j < 10);
int group1 = object1->getCollisionGroup();
for (j = 0; j < childcount; j++){
Object *object2 = childs[j];
int group2 = object2->getCollisionGroup();
if (isCollisionLink(group1, group2)){ /*j = 0;
object2->geometry->checkCollision(object1); do{
} contactresponse = false;
}
}*/
//printf("Contacts: %i\n", contactcount); //Collision contact
for (i = 0; i < contactcount; i++){
Contact *contact = &contacts[i];
if (handleCollision(contact)) contactresponse = true;
}
j++;
} while (contactresponse && j < 10);*/
bool contactresponse; /*j = 0;
do{
contactresponse = false;
j = 0; //Links between objects
do{ objectlinklist *node = linklist;
contactresponse = false; while (node != NULL){
ObjectLink *link = node->link;
if (handleLink(link)) contactresponse = true;
node = node->next;
}
//Links between objects j++;
objectlinklist *node = linklist; } while (contactresponse && j < 3);*/
while (node != NULL){
ObjectLink *link = node->link;
if (handleLink(link)) contactresponse = true;
node = node->next;
}
//Collision contact for (i = 0; i < childcount; i++) {
for (i = 0; i < contactcount; i++){ childs[i]->move();
Contact *contact = &contacts[i]; }
if (handleCollision(contact)) contactresponse = true; for (i = 0; i < particlecount; i++) {
} particles[i]->move();
}
j++;
} while (contactresponse && j < 10);
/*j = 0;
do{
contactresponse = false;
//Collision contact
for (i = 0; i < contactcount; i++){
Contact *contact = &contacts[i];
if (handleCollision(contact)) contactresponse = true;
}
j++;
} while (contactresponse && j < 10);*/
/*j = 0;
do{
contactresponse = false;
//Links between objects
objectlinklist *node = linklist;
while (node != NULL){
ObjectLink *link = node->link;
if (handleLink(link)) contactresponse = true;
node = node->next;
}
j++;
} while (contactresponse && j < 3);*/
for (i = 0; i < childcount; i++){
childs[i]->move();
}
for (i = 0; i < particlecount; i++){
particles[i]->move();
}
} }
void World::draw(void){ void World::draw(void) {
int i; int i;
for (i = 0; i < childcount; i++) childs[i]->draw(); for (i = 0; i < childcount; i++)
for (i = 0; i < particlecount; i++) particles[i]->draw(); childs[i]->draw();
for (i = 0; i < particlecount; i++)
particles[i]->draw();
} }
void World::addChild(Object *child){ void World::addChild(Object *child) {
objectlist *node = new objectlist; objectlist *node = new objectlist;
node->object = child; node->object = child;
node->next = childlist; node->next = childlist;
childlist = node; childlist = node;
} }
void World::addParticle(Particle *particle){ void World::addParticle(Particle *particle) {
if (particlecount < maxparticles){ if (particlecount < maxparticles) {
particles[particlecount++] = particle; particles[particlecount++] = particle;
}
}
void World::removeParticle(Particle *particle) {
int i;
for (i = 0; i < particlecount; i++) {
if (particles[i] == particle) {
particles[i] = particles[particlecount - 1];
particlecount--;
break;
} }
}
} }
void World::removeParticle(Particle *particle){ ObjectLink *World::addLink(Object *object1, Object *object2, float *point) {
int i; ObjectLink *link = new ObjectLink();
for (i = 0; i < particlecount; i++){ link->object1 = object1;
if (particles[i] == particle){ link->object2 = object2;
particles[i] = particles[particlecount-1]; if (point != NULL) {
particlecount--; object1->unTransformPoint(link->point1, point);
break; object2->unTransformPoint(link->point2, point);
}
}
}
ObjectLink *World::addLink(Object *object1, Object *object2, float *point){
ObjectLink *link = new ObjectLink();
link->object1 = object1;
link->object2 = object2;
if (point != NULL){
object1->unTransformPoint(link->point1, point);
object2->unTransformPoint(link->point2, point);
link->enabled = true;
} else{
link->enabled = false;
}
objectlinklist *node = new objectlinklist;
node->link = link;
node->next = linklist;
linklist = node;
return link;
}
void World::renewLink(ObjectLink *link, float *point){
link->object1->unTransformPoint(link->point1, point);
link->object2->unTransformPoint(link->point2, point);
link->enabled = true; link->enabled = true;
} else {
link->enabled = false;
}
objectlinklist *node = new objectlinklist;
node->link = link;
node->next = linklist;
linklist = node;
return link;
} }
void World::renewLink(ObjectLink *link, float *point) {
link->object1->unTransformPoint(link->point1, point);
link->object2->unTransformPoint(link->point2, point);
link->enabled = true;
}

52
src/world.h
View file

@ -7,50 +7,48 @@ class ObjectLink;
#include "object.h" #include "object.h"
#include "particle.h" #include "particle.h"
class ObjectLink{ class ObjectLink {
public: public:
Object *object1, *object2; Object *object1, *object2;
float point1[3], point2[3]; float point1[3], point2[3];
bool enabled; bool enabled;
}; };
struct objectlinklist{ struct objectlinklist {
ObjectLink *link; ObjectLink *link;
objectlinklist *next; objectlinklist *next;
}; };
#define MAXCONTACTS 100 #define MAXCONTACTS 100
class World{ class World {
private: private:
objectlist *childlist; objectlist *childlist;
int childcount; int childcount;
Object **childs; Object **childs;
int particlecount;
int maxparticles;
Particle **particles;
int particlecount; objectlinklist *linklist;
int maxparticles;
Particle **particles;
objectlinklist *linklist;
public: public:
World(void); World(void);
void prepare(void); void prepare(void);
void move(void); void move(void);
void draw(void); void draw(void);
void addChild(Object *child); void addChild(Object *child);
void addParticle(Particle *particle); void addParticle(Particle *particle);
void removeParticle(Particle *particle); void removeParticle(Particle *particle);
//Point is world-relative // Point is world-relative
ObjectLink *addLink(Object *object1, Object *object2, float *point); ObjectLink *addLink(Object *object1, Object *object2, float *point);
void renewLink(ObjectLink *link, float *point); void renewLink(ObjectLink *link, float *point);
}; };
#endif #endif