Menu
▾
▴
[Twin-e-cvs] twin-e/src HQRlib.c,1.11,1.12 actors.c,1.16,1.17 cdrom.c,1.11,1.12 costume.c,1.19,1.20 cube.c,1.6,1.7 fullRedraw.c,1.59,1.60 input.c,1.12,1.13 mainLoop.c,1.51,1.52 mainSDL.c,1.35,1.36 music.c,1.15,1.16 renderer.c,1.23,1.24 samples.c,1.7,1.8 threadCode.c,1.13,1.14 time.c,1.10,1.11 vars.h,1.47,1.48
|
From: Vincent H. <ya...@us...> - 2005-06-28 21:55:58
|
Update of /cvsroot/twin-e/twin-e/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24552/src Modified Files: HQRlib.c actors.c cdrom.c costume.c cube.c fullRedraw.c input.c mainLoop.c mainSDL.c music.c renderer.c samples.c threadCode.c time.c vars.h Log Message: More Macosx port fixes Index: time.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/time.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** time.c 23 Apr 2005 19:40:28 -0000 1.10 --- time.c 28 Jun 2005 21:55:48 -0000 1.11 *************** *** 20,24 **** #ifdef PCLIKE ! #include "SDL.h" #endif //PCLIKE --- 20,24 ---- #ifdef PCLIKE ! #include "SDL/SDL.h" #endif //PCLIKE Index: renderer.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/renderer.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** renderer.c 26 Jun 2005 21:56:49 -0000 1.23 --- renderer.c 28 Jun 2005 21:55:48 -0000 1.24 *************** *** 29,32 **** --- 29,36 ---- short int costumeHeader; + #ifdef MACOSX + // return 0; + #endif + tab1 = &angleTable[0]; tab2 = &angleTable[256]; *************** *** 37,43 **** _angleZ = angleZ; - #ifdef MACOSX - return 0; - #endif /* * Those 4 vars are used to know the size of the rendered model. They are resetted to their --- 41,44 ---- *************** *** 70,76 **** renderTabEntryPtr = renderTab; // we restart at the beginning of the renderTable ! costumeHeader = *(short int *) costumePtr; ! ptr = costumePtr + 16 + *(short int *) (costumePtr + 14); // we jump after the header if (costumeHeader & 2) // if animated --- 71,77 ---- renderTabEntryPtr = renderTab; // we restart at the beginning of the renderTable ! costumeHeader = READ_LE_U16(costumePtr); ! ptr = costumePtr + 16 + READ_LE_U16(costumePtr + 14); // we jump after the header if (costumeHeader & 2) // if animated *************** *** 175,179 **** int temp; ! _numOfPoints = *(short int *) costumePtr; costumePtr += 2; _pointsPtr = costumePtr; --- 176,180 ---- int temp; ! _numOfPoints = READ_LE_U16(costumePtr); costumePtr += 2; _pointsPtr = costumePtr; *************** *** 181,185 **** costumePtr += _numOfPoints * 6; ! _numOfParts = *(short int *) costumePtr; costumePtr += 2; _partsPtr = _partsPtr2 = costumePtr; --- 182,186 ---- costumePtr += _numOfPoints * 6; ! _numOfParts = READ_LE_U16(costumePtr); costumePtr += 2; _partsPtr = _partsPtr2 = costumePtr; *************** *** 200,209 **** do { ! if (ptEntryPtr->flag == 0) { loadPart(ptEntryPtr->rotateX, ptEntryPtr->rotateY, ptEntryPtr->rotateZ, ptEntryPtr); // rotation } else ! if (ptEntryPtr->flag == 1) { TranslateGroupe(ptEntryPtr->rotateX, ptEntryPtr->rotateY, ptEntryPtr->rotateZ, ptEntryPtr); // translation --- 201,211 ---- do { ! int boneType = READ_LE_U16(((unsigned char*)ptEntryPtr)+8); ! if (boneType == 0) { loadPart(ptEntryPtr->rotateX, ptEntryPtr->rotateY, ptEntryPtr->rotateZ, ptEntryPtr); // rotation } else ! if (boneType == 1) { TranslateGroupe(ptEntryPtr->rotateX, ptEntryPtr->rotateY, ptEntryPtr->rotateZ, ptEntryPtr); // translation *************** *** 311,315 **** _shadePtr = (int *) _partsPtr; ! temp = *(short int *) _shadePtr; _shadePtr = (int *) (((unsigned char *) _shadePtr) + 2); --- 313,317 ---- _shadePtr = (int *) _partsPtr; ! temp = READ_LE_U16(_shadePtr); _shadePtr = (int *) (((unsigned char *) _shadePtr) + 2); *************** *** 330,334 **** do { ! temp = *(short int *) ptr3; if (temp) { --- 332,336 ---- do { ! temp = READ_LE_U16(ptr3); if (temp) { *************** *** 357,363 **** colPtr = (short int *) _shadePtr; ! col1 = *(colPtr++); ! col2 = *(colPtr++); ! col3 = *(colPtr++); eax = _shadeMatrix[0] * col1 + _shadeMatrix[1] * col2 + _shadeMatrix[2] * col3; --- 359,365 ---- colPtr = (short int *) _shadePtr; ! col1 = READ_LE_S16(colPtr++); ! col2 = READ_LE_S16(colPtr++); ! col3 = READ_LE_S16(colPtr++); eax = _shadeMatrix[0] * col1 + _shadeMatrix[1] * col2 + _shadeMatrix[2] * col3; *************** *** 371,379 **** eax >>= 14; ptr6 = (unsigned char *) _shadePtr; ! eax /= *(unsigned short int *) (ptr6 + 6); edi = (unsigned short int) eax; } ! *(short int *) _currentShadeDestination = edi; _currentShadeDestination += 2; _shadePtr += 2; --- 373,381 ---- eax >>= 14; ptr6 = (unsigned char *) _shadePtr; ! eax /= READ_LE_U16(ptr6 + 6); edi = (unsigned short int) eax; } ! WRITE_LE_U16(_currentShadeDestination,edi); _currentShadeDestination += 2; _shadePtr += 2; *************** *** 389,393 **** } ! void loadPart(int edx, int ecx, int ebx, pointEntry * ptr) { int *ebp; --- 391,395 ---- } ! void loadPart(int edx, int ecx, int ebx, unsigned char * ptr) { int *ebp; *************** *** 396,402 **** // int* ptr1; ! int rs1v1 = ptr->data1; ! ! int rs1v2 = ptr->data2; _angleX = ebx; --- 398,403 ---- // int* ptr1; ! int rs1v1 = READ_LE_S16(ptr); ! int rs1v2 = READ_LE_S16(ptr+2); _angleX = ebx; *************** *** 410,414 **** } ! var = ptr->param; if (var == -1) // si c'est le premier point --- 411,415 ---- } ! var = READ_LE_U16(ptr+6); if (var == -1) // si c'est le premier point *************** *** 422,430 **** else { ebp = (int *) ((unsigned char *) _matrixTable + var); ! destX = _projectedPointTable[ptr->data3 / 6].x; ! destY = _projectedPointTable[ptr->data3 / 6].y; ! destZ = _projectedPointTable[ptr->data3 / 6].z; } --- 423,432 ---- else { + int pointIdx = (READ_LE_U16(ptr+4))/6; ebp = (int *) ((unsigned char *) _matrixTable + var); ! destX = _projectedPointTable[pointIdx].x; ! destY = _projectedPointTable[pointIdx].y; ! destZ = _projectedPointTable[pointIdx].z; } *************** *** 1003,1008 **** { unsigned char color = *(esi+1); ! short int center = *(short int*)(esi+6); ! short int size = *(short int*)(esi+4); osystem_addSphere( _flattenPointTable[center/6].x, _flattenPointTable[center/6].y, _flattenPointTable[center/6].z, size, color); --- 1005,1010 ---- { unsigned char color = *(esi+1); ! short int center = READ_LE_U16(esi+6); ! short int size = READ_LE_U16(esi+4); osystem_addSphere( _flattenPointTable[center/6].x, _flattenPointTable[center/6].y, _flattenPointTable[center/6].z, size, color); *************** *** 1064,1079 **** esi = renderTabEntryPtr2->dataPtr; renderV19 += 8; switch (type) { case 0: // draw a line { #ifndef PCLIKE break; #endif lineCoordinatesPtr = (lineCoordinates *) esi; ! color = (lineCoordinatesPtr->data & 0xFF00) >> 8; ! drawLine(lineCoordinatesPtr->x1,lineCoordinatesPtr->y1,lineCoordinatesPtr->x2,lineCoordinatesPtr->y2,color); break; } case 1: // draw a polygon { --- 1066,1094 ---- esi = renderTabEntryPtr2->dataPtr; renderV19 += 8; + switch (type) { case 0: // draw a line { + unsigned int x1; + unsigned int y1; + unsigned int x2; + unsigned int y2; + #ifndef PCLIKE break; #endif lineCoordinatesPtr = (lineCoordinates *) esi; ! color = (READ_LE_S32(&lineCoordinatesPtr->data) & 0xFF00) >> 8; ! ! x1 = READ_LE_U16((unsigned short int*)&lineCoordinatesPtr->x1); ! y1 = READ_LE_U16((unsigned short int*)&lineCoordinatesPtr->y1); ! x2 = READ_LE_U16((unsigned short int*)&lineCoordinatesPtr->x2); ! y2 = READ_LE_U16((unsigned short int*)&lineCoordinatesPtr->y2); ! ! drawLine(x1,y1,x2,y2,color); break; } + #ifndef MACOSX case 1: // draw a polygon { *************** *** 1101,1104 **** --- 1116,1120 ---- break; } + #endif case 2: // draw a circle { Index: actors.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/actors.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** actors.c 21 Nov 2004 00:12:12 -0000 1.16 --- actors.c 28 Jun 2005 21:55:47 -0000 1.17 *************** *** 133,142 **** ptr = (short int *) (spriteActorData + imageNumber * 16 + 4); ! lactor->boudingBox.X.bottomLeft = *(ptr++); ! lactor->boudingBox.X.topRight = *(ptr++); ! lactor->boudingBox.Y.bottomLeft = *(ptr++); ! lactor->boudingBox.Y.topRight = *(ptr++); ! lactor->boudingBox.Z.bottomLeft = *(ptr++); ! lactor->boudingBox.Z.topRight = *(ptr++); } } --- 133,142 ---- ptr = (short int *) (spriteActorData + imageNumber * 16 + 4); ! lactor->boudingBox.X.bottomLeft = READ_LE_S16(ptr++); ! lactor->boudingBox.X.topRight = READ_LE_S16(ptr++); ! lactor->boudingBox.Y.bottomLeft = READ_LE_S16(ptr++); ! lactor->boudingBox.Y.topRight = READ_LE_S16(ptr++); ! lactor->boudingBox.Z.bottomLeft = READ_LE_S16(ptr++); ! lactor->boudingBox.Z.topRight = READ_LE_S16(ptr++); } } Index: input.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/input.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** input.c 22 Apr 2005 10:44:02 -0000 1.12 --- input.c 28 Jun 2005 21:55:47 -0000 1.13 *************** *** 18,22 **** #include "lba.h" ! #include <SDL.h> void readKeyboard(void) --- 18,22 ---- #include "lba.h" ! #include <SDL/SDL.h> void readKeyboard(void) Index: fullRedraw.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/fullRedraw.c,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** fullRedraw.c 26 Jun 2005 21:56:32 -0000 1.59 --- fullRedraw.c 28 Jun 2005 21:55:47 -0000 1.60 *************** *** 1203,1207 **** unsigned char *zbufferSub1(int var) { ! return (currentBll + *(unsigned int *) (currentBll + 4 * var)); } --- 1203,1207 ---- unsigned char *zbufferSub1(int var) { ! return (currentBll + READ_LE_U32(currentBll + 4 * var)); } Index: costume.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/costume.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** costume.c 18 Nov 2004 23:05:47 -0000 1.19 --- costume.c 28 Jun 2005 21:55:47 -0000 1.20 *************** *** 113,122 **** ptr++; ! var1 = *(ptr++); ! var2 = *(ptr++); ! lactor->boudingBox.Y.bottomLeft = *(ptr++); ! lactor->boudingBox.Y.topRight = *(ptr++); ! var3 = *(ptr++); ! var4 = *ptr; if (lactor->staticFlagsBF.bIsUsingMiniZv) --- 113,122 ---- ptr++; ! var1 = READ_LE_S16(ptr++); ! var2 = READ_LE_S16(ptr++); ! lactor->boudingBox.Y.bottomLeft = READ_LE_S16(ptr++); ! lactor->boudingBox.Y.topRight = READ_LE_S16(ptr++); ! var3 = READ_LE_S16(ptr++); ! var4 = READ_LE_S16(ptr); if (lactor->staticFlagsBF.bIsUsingMiniZv) Index: mainLoop.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/mainLoop.c,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** mainLoop.c 12 Jun 2005 20:19:29 -0000 1.51 --- mainLoop.c 28 Jun 2005 21:55:47 -0000 1.52 *************** *** 2287,2291 **** ptr2 = (char *) currentBll; ! ptr2 += *(int *) (ptr2 + temp0 * 4 - 4); ptr2 += 3; --- 2287,2291 ---- ptr2 = (char *) currentBll; ! ptr2 += READ_LE_U32(ptr2 + temp0 * 4 - 4); ptr2 += 3; *************** *** 2387,2391 **** ptr2 = (char *) currentBll; ! ptr2 += *(int *) (ptr2 + temp0 * 4 - 4); ptr2 += 3; --- 2387,2391 ---- ptr2 = (char *) currentBll; ! ptr2 += READ_LE_U32(ptr2 + temp0 * 4 - 4); ptr2 += 3; Index: cdrom.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/cdrom.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** cdrom.c 21 Jul 2004 19:40:50 -0000 1.11 --- cdrom.c 28 Jun 2005 21:55:47 -0000 1.12 *************** *** 20,24 **** #ifdef PCLIKE ! #include "SDL.h" #endif --- 20,24 ---- #ifdef PCLIKE ! #include "SDL/SDL.h" #endif Index: music.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/music.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** music.c 26 Jun 2005 18:51:57 -0000 1.15 --- music.c 28 Jun 2005 21:55:48 -0000 1.16 *************** *** 21,25 **** #ifdef PCLIKE //#include <SDL_mixer.h> ! #include "SDL.h" #endif //PCLIKE --- 21,25 ---- #ifdef PCLIKE //#include <SDL_mixer.h> ! #include "SDL/SDL.h" #endif //PCLIKE Index: cube.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/cube.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** cube.c 26 Jun 2005 18:51:57 -0000 1.6 --- cube.c 28 Jun 2005 21:55:47 -0000 1.7 *************** *** 179,183 **** for(i=0;i<64;i++) { ! addCubeEntry(currentGrid + *(unsigned short int *) (currentGrid + 2 * (i + ptr2)), bufCube + ptr1); ptr1 += 50; } --- 179,183 ---- for(i=0;i<64;i++) { ! addCubeEntry(currentGrid + READ_LE_U16(currentGrid + 2 * (i + ptr2)), bufCube + ptr1); ptr1 += 50; } Index: threadCode.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/threadCode.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** threadCode.c 21 Jul 2004 19:40:51 -0000 1.13 --- threadCode.c 28 Jun 2005 21:55:48 -0000 1.14 *************** *** 18,23 **** #include "lba.h" ! #include "SDL.h" ! #include "SDL_thread.h" /* extern volatile int lba_time; --- 18,23 ---- #include "lba.h" ! #include "SDL/SDL.h" ! #include "SDL/SDL_thread.h" /* extern volatile int lba_time; Index: vars.h =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/vars.h,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** vars.h 26 Jun 2005 18:51:57 -0000 1.47 --- vars.h 28 Jun 2005 21:55:48 -0000 1.48 *************** *** 207,211 **** extern unsigned char *_partsPtr2; ! void loadPart(int edx, int ecx, int ebx, pointEntry * ptr); int AffObjetIso(int X, int Y, int Z, int angleX, int angleY, int angleZ, unsigned char *costumePtr); void SetLightVector(int a, int b, int c); --- 207,211 ---- extern unsigned char *_partsPtr2; ! void loadPart(int edx, int ecx, int ebx, unsigned char * ptr); int AffObjetIso(int X, int Y, int Z, int angleX, int angleY, int angleZ, unsigned char *costumePtr); void SetLightVector(int a, int b, int c); Index: samples.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/samples.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** samples.c 26 Jun 2005 18:51:57 -0000 1.7 --- samples.c 28 Jun 2005 21:55:48 -0000 1.8 *************** *** 20,24 **** #ifdef PCLIKE ! #include <SDL_mixer.h> #endif --- 20,24 ---- #ifdef PCLIKE ! //#include <SDL_mixer.h> #endif *************** *** 34,38 **** void playSample(int sampleNum, int freq, int repeat, int x, int y) { ! char filename[256]; Mix_Chunk * sample; FILE* fhandle; --- 34,38 ---- void playSample(int sampleNum, int freq, int repeat, int x, int y) { ! /* char filename[256]; Mix_Chunk * sample; FILE* fhandle; *************** *** 46,55 **** } ! Mix_PlayChannel(0,sample,repeat-1); } void playSampleFla(int sampleNum, int freq, int repeat, int x, int y) { ! char filename[256]; Mix_Chunk * sample; --- 46,55 ---- } ! Mix_PlayChannel(0,sample,repeat-1);*/ } void playSampleFla(int sampleNum, int freq, int repeat, int x, int y) { ! /* char filename[256]; Mix_Chunk * sample; *************** *** 58,61 **** --- 58,62 ---- sample=Mix_LoadWAV(filename); Mix_PlayChannel(0,sample,repeat-1); + */ } *************** *** 72,80 **** #define midiFileName "Midi_mi_win" ! Mix_Music * sample = NULL; void playMidi(int musicNum) { ! char filename[256]; FILE* fhandle; --- 73,81 ---- #define midiFileName "Midi_mi_win" ! //Mix_Music * sample = NULL; void playMidi(int musicNum) { ! /* char filename[256]; FILE* fhandle; *************** *** 118,120 **** --- 119,122 ---- } Mix_PlayMusic(sample,0); + */ } Index: mainSDL.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/mainSDL.c,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** mainSDL.c 26 Jun 2005 18:51:57 -0000 1.35 --- mainSDL.c 28 Jun 2005 21:55:48 -0000 1.36 *************** *** 19,29 **** void studioTick(void); - #define USE_SDL_MIXER true - #define USE_OPENAL false #define playSounds true ! #include "SDL.h" ! #include "SDL_thread.h" #include "lba.h" --- 19,27 ---- void studioTick(void); #define playSounds true ! #include "SDL/SDL.h" ! #include "SDL/SDL_thread.h" #include "lba.h" Index: HQRlib.c =================================================================== RCS file: /cvsroot/twin-e/twin-e/src/HQRlib.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** HQRlib.c 26 Jun 2005 18:51:57 -0000 1.11 --- HQRlib.c 28 Jun 2005 21:55:47 -0000 1.12 *************** *** 403,410 **** unsigned char *HQR_Get(hqr_entry * hqrPtr, short int arg_4) { ! int headerSize; ! int offToData; ! int dataSize; ! int compressedSize; short int mode; --- 403,410 ---- unsigned char *HQR_Get(hqr_entry * hqrPtr, short int arg_4) { ! unsigned int headerSize; ! unsigned int offToData; ! unsigned int dataSize; ! unsigned int compressedSize; short int mode; *************** *** 446,449 **** --- 446,450 ---- streamReader_get( &fileReader, &headerSize, 4 ); + headerSize = convertDWFromLE(headerSize); if( arg_4 >= headerSize / 4 ) *************** *** 455,463 **** --- 456,468 ---- streamReader_seek( &fileReader, arg_4 * 4 ); streamReader_get( &fileReader, &offToData, 4 ); + offToData = convertDWFromLE(offToData); streamReader_seek( &fileReader, offToData ); streamReader_get( &fileReader, &dataSize, 4) ; + dataSize = convertDWFromLE(dataSize); streamReader_get( &fileReader, &compressedSize, 4) ; + compressedSize = convertDWFromLE(compressedSize); streamReader_get( &fileReader, &mode, 2) ; + mode = convertWFromLE(mode); dataSize2 = dataSize; |
