Cube  Diff

Differences From Artifact [a74f6892f8]:

To Artifact [eb988e3999]:


1
2
3
4


5
6
7
8
9
10
11
#import "MD2.h"

#include "cube.h"



struct md2_header {
	int magic;
	int version;
	int skinWidth, skinHeight;
	int frameSize;
	int numSkins, numVertices, numTexcoords;
	int numTriangles, numGlCommands, numFrames;




>
>







1
2
3
4
5
6
7
8
9
10
11
12
13
#import "MD2.h"

#include "cube.h"

#import "OFColor+Cube.h"

struct md2_header {
	int magic;
	int version;
	int skinWidth, skinHeight;
	int frameSize;
	int numSkins, numVertices, numTexcoords;
	int numTriangles, numGlCommands, numFrames;
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
			[self scaleWithFrame:frame + i scale:sc snap:sn];

	glPushMatrix();
	glTranslatef(position.x, position.y, position.z);
	glRotatef(yaw + 180, 0, -1, 0);
	glRotatef(pitch, 0, 0, 1);

	float red, green, blue;
	[light getRed:&red green:&green blue:&blue alpha:NULL];
	glColor3f(red, green, blue);

	if (_displaylist && frame == 0 && range == 1) {
		glCallList(_displaylist);
		xtraverts += _displaylistverts;
	} else {
		if (frame == 0 && range == 1) {
			static int displaylistn = 10;







<
<
|







155
156
157
158
159
160
161


162
163
164
165
166
167
168
169
			[self scaleWithFrame:frame + i scale:sc snap:sn];

	glPushMatrix();
	glTranslatef(position.x, position.y, position.z);
	glRotatef(yaw + 180, 0, -1, 0);
	glRotatef(pitch, 0, 0, 1);



	[light cube_setAsGLColor];

	if (_displaylist && frame == 0 && range == 1) {
		glCallList(_displaylist);
		xtraverts += _displaylistverts;
	} else {
		if (frame == 0 && range == 1) {
			static int displaylistn = 10;