fix PropPtr hw exception
This commit is contained in:
parent
9956b67a5c
commit
797b29f8ee
@ -227,7 +227,7 @@ u_short timer = 0;
|
||||
|
||||
// Cam stuff
|
||||
|
||||
int camMode = 5;
|
||||
int camMode = 0;
|
||||
|
||||
long timeB = 0;
|
||||
|
||||
@ -395,10 +395,6 @@ int main() {
|
||||
|
||||
VECTOR objAngleToCam = {0, 0, 0, 0};
|
||||
|
||||
//~ long objAngleToCam = 0;
|
||||
|
||||
|
||||
|
||||
int angle = 0; //PSX units = 4096 == 360° = 2Pi
|
||||
|
||||
int dist = 0; //PSX units
|
||||
@ -473,10 +469,13 @@ int main() {
|
||||
objAngleToCam.vx = patan( posToCam.vx,posToCam.vy );
|
||||
|
||||
//~ objAngleToCam.vz = patan( posToCam.vz,posToCam.vy );
|
||||
|
||||
//~ objAngleToCam.vx = patan( psqrt(posToCam.vx * posToCam.vx + posToCam.vy * posToCam.vy), posToCam.vy );
|
||||
|
||||
//~ meshPlan.rot->vx = -( (objAngleToCam.vx >> 4) - 3076 ) ;
|
||||
|
||||
//~ meshPlan.rot->vx = (( (objAngleToCam.vx >> 4) - 3076 ) * ( (objAngleToCam.vz >> 4) - 3076 ) >> 12) * (nsin(posToCam.vz) >> 10 < 0 ? -1 : 1);
|
||||
|
||||
//~ meshPlan.rot->vx = ( (objAngleToCam.vx >> 4) - 3076 ) * ( (objAngleToCam.vz >> 4) - 3076 ) >> 12 ;
|
||||
|
||||
meshPlan.rot->vy = -( (objAngleToCam.vy >> 4) + 1024 ) ;
|
||||
@ -791,15 +790,19 @@ int main() {
|
||||
//~ FntPrint("Cam %d, %d, %d\n", camera.pos.vx, camera.pos.vy, camera.pos.vz);
|
||||
//~ FntPrint("Pos: %d Cur: %d\nTheta y: %d x: %d\n", camPath.pos, camPath.cursor, theta.vy, theta.vx);
|
||||
|
||||
FntPrint("%d %d\n", camAngleToAct.vy, dist);
|
||||
FntPrint("%d %d %d %d\n", camAngleToAct.vy, camera.pos.vx, camera.rot.vy, dist);
|
||||
|
||||
if ( camAngleToAct.vy < -50 ) {
|
||||
// Ony move cam if position is between first camPath.vx and last camPath.vx
|
||||
|
||||
if ( camAngleToAct.vy < -50 && camera.pos.vx > camPath.points[camPath.len - 1].vx ) {
|
||||
|
||||
// Clamp camPath position to cameraSpeed
|
||||
|
||||
camPath.pos += dist < cameraSpeed ? 0 : cameraSpeed ;
|
||||
|
||||
}
|
||||
|
||||
if ( camAngleToAct.vy > 50 ) {
|
||||
if ( camAngleToAct.vy > 50 && camera.pos.vx > camPath.points[camPath.cursor].vx ) {
|
||||
|
||||
camPath.pos -= dist < cameraSpeed ? 0 : cameraSpeed;
|
||||
|
||||
@ -865,9 +868,11 @@ int main() {
|
||||
|
||||
}
|
||||
|
||||
// FIXME ! //~ // Moveable prop
|
||||
// FIXME !
|
||||
// Moveable prop
|
||||
|
||||
//~ if ( !getIntCollision( *propPtr->body , *curNode->siblings->list[msh]->plane->body).vx &&
|
||||
|
||||
//~ !getIntCollision( *propPtr->body , *curNode->siblings->list[msh]->plane->body).vz ) {
|
||||
|
||||
//~ if ( propPtr->node != curNode->siblings->list[ msh ]){
|
||||
@ -875,8 +880,10 @@ int main() {
|
||||
//~ propPtr->node = curNode->siblings->list[ msh ];
|
||||
//~ }
|
||||
|
||||
//~ } else
|
||||
//~ }
|
||||
|
||||
if ( !getIntCollision( *propPtr->body , *curNode->plane->body).vx &&
|
||||
|
||||
!getIntCollision( *propPtr->body , *curNode->plane->body).vz ) {
|
||||
|
||||
propPtr->node = curNode;
|
||||
@ -906,37 +913,51 @@ int main() {
|
||||
col_lvl = getIntCollision( *meshes[k]->body , *levelPtr->body );
|
||||
|
||||
|
||||
//~ col_sphere = getIntCollision( *propPtr->body, *propPtr->node->plane->body );
|
||||
col_sphere = getIntCollision( *propPtr->body, *propPtr->node->plane->body );
|
||||
|
||||
// col_sphere = getIntCollision( *propPtr->body, *levelPtr->body );
|
||||
|
||||
col_sphere_act = getExtCollision( *actorPtr->body, *propPtr->body );
|
||||
|
||||
//~ // If no col with ground, fall off
|
||||
// If no col with ground, fall off
|
||||
|
||||
if ( col_lvl.vy ) {
|
||||
|
||||
if (!col_lvl.vx && !col_lvl.vz){actorPtr->body->position.vy = actorPtr->body->min.vy;}
|
||||
if ( !col_lvl.vx && !col_lvl.vz ) {
|
||||
|
||||
actorPtr->body->position.vy = actorPtr->body->min.vy;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (col_sphere.vy){
|
||||
if (!col_sphere.vx && !col_sphere.vz){propPtr->body->position.vy = propPtr->body->min.vy; }
|
||||
|
||||
if ( !col_sphere.vx && !col_sphere.vz ) {
|
||||
|
||||
propPtr->body->position.vy = propPtr->body->min.vy;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (col_sphere_act.vx && col_sphere_act.vz ) {
|
||||
|
||||
propPtr->body->velocity.vx += actorPtr->body->velocity.vx;// * ONE / propPtr->body->restitution ;
|
||||
propPtr->body->velocity.vz += actorPtr->body->velocity.vz;// * ONE / propPtr->body->restitution ;
|
||||
propPtr->body->velocity.vx += actorPtr->body->velocity.vx;
|
||||
|
||||
propPtr->body->velocity.vz += actorPtr->body->velocity.vz;
|
||||
|
||||
if ( propPtr->body->velocity.vx ) {
|
||||
|
||||
VECTOR L = angularMom(*propPtr->body);
|
||||
|
||||
propPtr->rot->vz -= L.vx;
|
||||
}
|
||||
|
||||
if ( propPtr->body->velocity.vz ) {
|
||||
|
||||
VECTOR L = angularMom( *propPtr->body );
|
||||
|
||||
propPtr->rot->vx -= L.vz;
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
TIM/cat.tim
BIN
TIM/cat.tim
Binary file not shown.
BIN
TIM/home.tim
BIN
TIM/home.tim
Binary file not shown.
BIN
TIM/lara.tim
BIN
TIM/lara.tim
Binary file not shown.
BIN
coridor2.blend
BIN
coridor2.blend
Binary file not shown.
380
coridor2.c
380
coridor2.c
@ -144,7 +144,7 @@ CAMPATH camPath = {
|
||||
0,
|
||||
0,
|
||||
{
|
||||
{-205,156,-17},
|
||||
{ 490,101,113 },
|
||||
{ 221,309,-48 },
|
||||
{ -159,57,61 },
|
||||
{ -208,216,-86 },
|
||||
@ -1085,6 +1085,14 @@ extern unsigned long _binary_TIM_cat_tim_length;
|
||||
|
||||
TIM_IMAGE tim_cat;
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshCube = {
|
||||
&modelCube,
|
||||
modelCube_index,
|
||||
@ -1105,6 +1113,7 @@ MESH meshCube = {
|
||||
&modelCube_OTz,
|
||||
&modelCube_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -1939,6 +1948,14 @@ extern unsigned long _binary_TIM_home_tim_length;
|
||||
|
||||
TIM_IMAGE tim_home;
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshCylindre = {
|
||||
&modelCylindre,
|
||||
modelCylindre_index,
|
||||
@ -1959,6 +1976,7 @@ MESH meshCylindre = {
|
||||
&modelCylindre_OTz,
|
||||
&modelCylindre_body,
|
||||
&modelCylindre_anim,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -2394,7 +2412,7 @@ short modelgnd_isPrism = 0;
|
||||
short modelgnd_isAnim = 0;
|
||||
short modelgnd_isActor = 0;
|
||||
short modelgnd_isLevel = 1;
|
||||
short modelgnd_isBG = 1;
|
||||
short modelgnd_isBG = 0;
|
||||
short modelgnd_isSprite = 0;
|
||||
long modelgnd_p = 0;
|
||||
long modelgnd_OTz = 0;
|
||||
@ -2417,6 +2435,14 @@ TMESH modelgnd = {
|
||||
48
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshgnd = {
|
||||
&modelgnd,
|
||||
modelgnd_index,
|
||||
@ -2437,6 +2463,7 @@ MESH meshgnd = {
|
||||
&modelgnd_OTz,
|
||||
&modelgnd_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -2722,7 +2749,7 @@ short modelgnd_001_isPrism = 0;
|
||||
short modelgnd_001_isAnim = 0;
|
||||
short modelgnd_001_isActor = 0;
|
||||
short modelgnd_001_isLevel = 1;
|
||||
short modelgnd_001_isBG = 1;
|
||||
short modelgnd_001_isBG = 0;
|
||||
short modelgnd_001_isSprite = 0;
|
||||
long modelgnd_001_p = 0;
|
||||
long modelgnd_001_OTz = 0;
|
||||
@ -2745,6 +2772,14 @@ TMESH modelgnd_001 = {
|
||||
30
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshgnd_001 = {
|
||||
&modelgnd_001,
|
||||
modelgnd_001_index,
|
||||
@ -2765,6 +2800,7 @@ MESH meshgnd_001 = {
|
||||
&modelgnd_001_OTz,
|
||||
&modelgnd_001_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -3050,7 +3086,7 @@ short modelgnd_003_isPrism = 0;
|
||||
short modelgnd_003_isAnim = 0;
|
||||
short modelgnd_003_isActor = 0;
|
||||
short modelgnd_003_isLevel = 1;
|
||||
short modelgnd_003_isBG = 1;
|
||||
short modelgnd_003_isBG = 0;
|
||||
short modelgnd_003_isSprite = 0;
|
||||
long modelgnd_003_p = 0;
|
||||
long modelgnd_003_OTz = 0;
|
||||
@ -3073,6 +3109,14 @@ TMESH modelgnd_003 = {
|
||||
30
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshgnd_003 = {
|
||||
&modelgnd_003,
|
||||
modelgnd_003_index,
|
||||
@ -3093,6 +3137,7 @@ MESH meshgnd_003 = {
|
||||
&modelgnd_003_OTz,
|
||||
&modelgnd_003_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -3378,7 +3423,7 @@ short modelgnd_002_isPrism = 0;
|
||||
short modelgnd_002_isAnim = 0;
|
||||
short modelgnd_002_isActor = 0;
|
||||
short modelgnd_002_isLevel = 1;
|
||||
short modelgnd_002_isBG = 1;
|
||||
short modelgnd_002_isBG = 0;
|
||||
short modelgnd_002_isSprite = 0;
|
||||
long modelgnd_002_p = 0;
|
||||
long modelgnd_002_OTz = 0;
|
||||
@ -3401,6 +3446,14 @@ TMESH modelgnd_002 = {
|
||||
30
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshgnd_002 = {
|
||||
&modelgnd_002,
|
||||
modelgnd_002_index,
|
||||
@ -3421,6 +3474,7 @@ MESH meshgnd_002 = {
|
||||
&modelgnd_002_OTz,
|
||||
&modelgnd_002_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -9023,6 +9077,14 @@ extern unsigned long _binary_TIM_lara_tim_length;
|
||||
|
||||
TIM_IMAGE tim_lara;
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshLara = {
|
||||
&modelLara,
|
||||
modelLara_index,
|
||||
@ -9043,6 +9105,7 @@ MESH meshLara = {
|
||||
&modelLara_OTz,
|
||||
&modelLara_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -9193,6 +9256,14 @@ TMESH modelobject = {
|
||||
12
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshobject = {
|
||||
&modelobject,
|
||||
modelobject_index,
|
||||
@ -9213,6 +9284,7 @@ MESH meshobject = {
|
||||
&modelobject_OTz,
|
||||
&modelobject_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -9248,7 +9320,7 @@ PRIM modelPlan_index[] = {
|
||||
};
|
||||
|
||||
MATRIX modelPlan_matrix = {0};
|
||||
VECTOR modelPlan_pos = {-40,-40,132, 0};
|
||||
VECTOR modelPlan_pos = {-40,-40,194, 0};
|
||||
SVECTOR modelPlan_rot = {0,0,0};
|
||||
short modelPlan_isRigidBody = 0;
|
||||
short modelPlan_isStaticBody = 1;
|
||||
@ -9262,7 +9334,7 @@ long modelPlan_p = 0;
|
||||
long modelPlan_OTz = 0;
|
||||
BODY modelPlan_body = {
|
||||
{0, 0, 0, 0},
|
||||
-40,-40,132, 0,
|
||||
-40,-40,194, 0,
|
||||
0,0,0, 0,
|
||||
1,
|
||||
ONE/1,
|
||||
@ -9279,6 +9351,14 @@ TMESH modelPlan = {
|
||||
1
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshPlan = {
|
||||
&modelPlan,
|
||||
modelPlan_index,
|
||||
@ -9299,6 +9379,7 @@ MESH meshPlan = {
|
||||
&modelPlan_OTz,
|
||||
&modelPlan_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -9722,8 +9803,8 @@ PRIM modelSphere_index[] = {
|
||||
};
|
||||
|
||||
MATRIX modelSphere_matrix = {0};
|
||||
VECTOR modelSphere_pos = {-513,-129,15, 0};
|
||||
SVECTOR modelSphere_rot = {0,1033,0};
|
||||
VECTOR modelSphere_pos = {333,-129,-298, 0};
|
||||
SVECTOR modelSphere_rot = {0,0,0};
|
||||
short modelSphere_isRigidBody = 1;
|
||||
short modelSphere_isStaticBody = 0;
|
||||
short modelSphere_isPrism = 0;
|
||||
@ -9736,8 +9817,8 @@ long modelSphere_p = 0;
|
||||
long modelSphere_OTz = 0;
|
||||
BODY modelSphere_body = {
|
||||
{0, 0, 0, 0},
|
||||
-513,-129,15, 0,
|
||||
0,1033,0, 0,
|
||||
333,-129,-298, 0,
|
||||
0,0,0, 0,
|
||||
2,
|
||||
ONE/2,
|
||||
-25,-24,-24, 0,
|
||||
@ -9753,6 +9834,14 @@ TMESH modelSphere = {
|
||||
50
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshSphere = {
|
||||
&modelSphere,
|
||||
modelSphere_index,
|
||||
@ -9773,6 +9862,7 @@ MESH meshSphere = {
|
||||
&modelSphere_OTz,
|
||||
&modelSphere_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -10227,6 +10317,14 @@ TMESH modelSphere_001 = {
|
||||
50
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshSphere_001 = {
|
||||
&modelSphere_001,
|
||||
modelSphere_001_index,
|
||||
@ -10247,6 +10345,7 @@ MESH meshSphere_001 = {
|
||||
&modelSphere_001_OTz,
|
||||
&modelSphere_001_body,
|
||||
0,
|
||||
&nodegnd,
|
||||
0
|
||||
};
|
||||
|
||||
@ -10382,7 +10481,7 @@ short modelwall_isPrism = 0;
|
||||
short modelwall_isAnim = 0;
|
||||
short modelwall_isActor = 0;
|
||||
short modelwall_isLevel = 0;
|
||||
short modelwall_isBG = 1;
|
||||
short modelwall_isBG = 0;
|
||||
short modelwall_isSprite = 0;
|
||||
long modelwall_p = 0;
|
||||
long modelwall_OTz = 0;
|
||||
@ -10405,6 +10504,14 @@ TMESH modelwall = {
|
||||
12
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshwall = {
|
||||
&modelwall,
|
||||
modelwall_index,
|
||||
@ -10425,6 +10532,7 @@ MESH meshwall = {
|
||||
&modelwall_OTz,
|
||||
&modelwall_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -10628,7 +10736,7 @@ short modelwall_001_isPrism = 0;
|
||||
short modelwall_001_isAnim = 0;
|
||||
short modelwall_001_isActor = 0;
|
||||
short modelwall_001_isLevel = 0;
|
||||
short modelwall_001_isBG = 1;
|
||||
short modelwall_001_isBG = 0;
|
||||
short modelwall_001_isSprite = 0;
|
||||
long modelwall_001_p = 0;
|
||||
long modelwall_001_OTz = 0;
|
||||
@ -10651,6 +10759,14 @@ TMESH modelwall_001 = {
|
||||
20
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshwall_001 = {
|
||||
&modelwall_001,
|
||||
modelwall_001_index,
|
||||
@ -10671,6 +10787,7 @@ MESH meshwall_001 = {
|
||||
&modelwall_001_OTz,
|
||||
&modelwall_001_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -10874,7 +10991,7 @@ short modelwall_002_isPrism = 0;
|
||||
short modelwall_002_isAnim = 0;
|
||||
short modelwall_002_isActor = 0;
|
||||
short modelwall_002_isLevel = 0;
|
||||
short modelwall_002_isBG = 1;
|
||||
short modelwall_002_isBG = 0;
|
||||
short modelwall_002_isSprite = 0;
|
||||
long modelwall_002_p = 0;
|
||||
long modelwall_002_OTz = 0;
|
||||
@ -10897,6 +11014,14 @@ TMESH modelwall_002 = {
|
||||
20
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshwall_002 = {
|
||||
&modelwall_002,
|
||||
modelwall_002_index,
|
||||
@ -10917,6 +11042,7 @@ MESH meshwall_002 = {
|
||||
&modelwall_002_OTz,
|
||||
&modelwall_002_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -11052,7 +11178,7 @@ short modelwall_003_isPrism = 0;
|
||||
short modelwall_003_isAnim = 0;
|
||||
short modelwall_003_isActor = 0;
|
||||
short modelwall_003_isLevel = 0;
|
||||
short modelwall_003_isBG = 1;
|
||||
short modelwall_003_isBG = 0;
|
||||
short modelwall_003_isSprite = 0;
|
||||
long modelwall_003_p = 0;
|
||||
long modelwall_003_OTz = 0;
|
||||
@ -11075,6 +11201,14 @@ TMESH modelwall_003 = {
|
||||
12
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
MESH meshwall_003 = {
|
||||
&modelwall_003,
|
||||
modelwall_003_index,
|
||||
@ -11095,6 +11229,7 @@ MESH meshwall_003 = {
|
||||
&modelwall_003_OTz,
|
||||
&modelwall_003_body,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
@ -11115,216 +11250,19 @@ MESH * meshes[15] = {
|
||||
&meshwall_002,
|
||||
&meshwall_003
|
||||
};
|
||||
extern unsigned long _binary_TIM_bg_camPath_tim_start[];
|
||||
extern unsigned long _binary_TIM_bg_camPath_tim_end[];
|
||||
extern unsigned long _binary_TIM_bg_camPath_tim_length;
|
||||
|
||||
TIM_IMAGE tim_bg_camPath;
|
||||
|
||||
CAMANGLE camAngle_camPath = {
|
||||
&camPos_camPath,
|
||||
&tim_bg_camPath,
|
||||
_binary_TIM_bg_camPath_tim_start,
|
||||
// Write quad NW, NE, SE, SW
|
||||
{
|
||||
{ 0, 0, 0, 0 },
|
||||
{ 0, 0, 0, 0 },
|
||||
{ 0, 0, 0, 0 },
|
||||
{ 0, 0, 0, 0 }
|
||||
},
|
||||
{
|
||||
{ -45, 206, 142, 0 },
|
||||
{ 186, 198, 142, 0 },
|
||||
{ 186, 198, 19, 0 },
|
||||
{ -45, 206, 19, 0 }
|
||||
},
|
||||
6,
|
||||
{
|
||||
&meshCube,
|
||||
&meshCylindre,
|
||||
&meshLara,
|
||||
&meshPlan,
|
||||
&meshSphere,
|
||||
&meshSphere_001
|
||||
}
|
||||
};
|
||||
|
||||
extern unsigned long _binary_TIM_bg_camPath_001_tim_start[];
|
||||
extern unsigned long _binary_TIM_bg_camPath_001_tim_end[];
|
||||
extern unsigned long _binary_TIM_bg_camPath_001_tim_length;
|
||||
|
||||
TIM_IMAGE tim_bg_camPath_001;
|
||||
|
||||
CAMANGLE camAngle_camPath_001 = {
|
||||
&camPos_camPath_001,
|
||||
&tim_bg_camPath_001,
|
||||
_binary_TIM_bg_camPath_001_tim_start,
|
||||
// Write quad NW, NE, SE, SW
|
||||
{
|
||||
{ 0, 0, 0, 0 },
|
||||
{ 0, 0, 0, 0 },
|
||||
{ 0, 0, 0, 0 },
|
||||
{ 0, 0, 0, 0 }
|
||||
},
|
||||
{
|
||||
{ -368, 176, 118, 0 },
|
||||
{ -368, -50, 118, 0 },
|
||||
{ -368, -49, 15, 0 },
|
||||
{ -368, 176, 15, 0 }
|
||||
},
|
||||
2,
|
||||
{
|
||||
&meshCube,
|
||||
&meshSphere
|
||||
}
|
||||
0,
|
||||
0,
|
||||
{ 0 },
|
||||
{ 0 },
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
extern unsigned long _binary_TIM_bg_camPath_002_tim_start[];
|
||||
extern unsigned long _binary_TIM_bg_camPath_002_tim_end[];
|
||||
extern unsigned long _binary_TIM_bg_camPath_002_tim_length;
|
||||
|
||||
TIM_IMAGE tim_bg_camPath_002;
|
||||
|
||||
CAMANGLE camAngle_camPath_002 = {
|
||||
&camPos_camPath_002,
|
||||
&tim_bg_camPath_002,
|
||||
_binary_TIM_bg_camPath_002_tim_start,
|
||||
// Write quad NW, NE, SE, SW
|
||||
{
|
||||
{ -368, 176, 118, 0 },
|
||||
{ -368, -50, 118, 0 },
|
||||
{ -368, -49, 15, 0 },
|
||||
{ -368, 176, 15, 0 }
|
||||
},
|
||||
{
|
||||
{ -112, 185, 166, 0 },
|
||||
{ -112, -41, 166, 0 },
|
||||
{ -113, -40, 15, 0 },
|
||||
{ -113, 185, 15, 0 }
|
||||
},
|
||||
3,
|
||||
{
|
||||
&meshCube,
|
||||
&meshPlan,
|
||||
&meshSphere
|
||||
}
|
||||
CAMANGLE * camAngles[0] = {
|
||||
};
|
||||
|
||||
extern unsigned long _binary_TIM_bg_camPath_003_tim_start[];
|
||||
extern unsigned long _binary_TIM_bg_camPath_003_tim_end[];
|
||||
extern unsigned long _binary_TIM_bg_camPath_003_tim_length;
|
||||
|
||||
TIM_IMAGE tim_bg_camPath_003;
|
||||
|
||||
CAMANGLE camAngle_camPath_003 = {
|
||||
&camPos_camPath_003,
|
||||
&tim_bg_camPath_003,
|
||||
_binary_TIM_bg_camPath_003_tim_start,
|
||||
// Write quad NW, NE, SE, SW
|
||||
{
|
||||
{ -112, 185, 166, 0 },
|
||||
{ -112, -41, 166, 0 },
|
||||
{ -113, -40, 15, 0 },
|
||||
{ -113, 185, 15, 0 }
|
||||
},
|
||||
{
|
||||
{ -45, 206, 142, 0 },
|
||||
{ 186, 198, 142, 0 },
|
||||
{ 186, 198, 19, 0 },
|
||||
{ -45, 206, 19, 0 }
|
||||
},
|
||||
5,
|
||||
{
|
||||
&meshCube,
|
||||
&meshCylindre,
|
||||
&meshLara,
|
||||
&meshSphere_001,
|
||||
&meshSphere
|
||||
}
|
||||
};
|
||||
|
||||
extern unsigned long _binary_TIM_bg_camPath_004_tim_start[];
|
||||
extern unsigned long _binary_TIM_bg_camPath_004_tim_end[];
|
||||
extern unsigned long _binary_TIM_bg_camPath_004_tim_length;
|
||||
|
||||
TIM_IMAGE tim_bg_camPath_004;
|
||||
|
||||
CAMANGLE camAngle_camPath_004 = {
|
||||
&camPos_camPath_004,
|
||||
&tim_bg_camPath_004,
|
||||
_binary_TIM_bg_camPath_004_tim_start,
|
||||
// Write quad NW, NE, SE, SW
|
||||
{
|
||||
{ -112, 185, 166, 0 },
|
||||
{ -112, -41, 166, 0 },
|
||||
{ -113, -40, 15, 0 },
|
||||
{ -113, 185, 15, 0 }
|
||||
},
|
||||
{
|
||||
{ -45, 206, 142, 0 },
|
||||
{ 186, 198, 142, 0 },
|
||||
{ 186, 198, 19, 0 },
|
||||
{ -45, 206, 19, 0 }
|
||||
},
|
||||
6,
|
||||
{
|
||||
&meshCube,
|
||||
&meshCylindre,
|
||||
&meshLara,
|
||||
&meshPlan,
|
||||
&meshSphere,
|
||||
&meshSphere_001
|
||||
}
|
||||
};
|
||||
|
||||
extern unsigned long _binary_TIM_bg_camPath_005_tim_start[];
|
||||
extern unsigned long _binary_TIM_bg_camPath_005_tim_end[];
|
||||
extern unsigned long _binary_TIM_bg_camPath_005_tim_length;
|
||||
|
||||
TIM_IMAGE tim_bg_camPath_005;
|
||||
|
||||
CAMANGLE camAngle_camPath_005 = {
|
||||
&camPos_camPath_005,
|
||||
&tim_bg_camPath_005,
|
||||
_binary_TIM_bg_camPath_005_tim_start,
|
||||
// Write quad NW, NE, SE, SW
|
||||
{
|
||||
{ -45, 206, 142, 0 },
|
||||
{ 186, 198, 142, 0 },
|
||||
{ 186, 198, 19, 0 },
|
||||
{ -45, 206, 19, 0 }
|
||||
},
|
||||
{
|
||||
{ 0, 0, 0, 0 },
|
||||
{ 0, 0, 0, 0 },
|
||||
{ 0, 0, 0, 0 },
|
||||
{ 0, 0, 0, 0 }
|
||||
},
|
||||
3,
|
||||
{
|
||||
&meshCylindre,
|
||||
&meshSphere_001,
|
||||
&meshSphere
|
||||
}
|
||||
};
|
||||
|
||||
CAMANGLE * camAngles[6] = {
|
||||
&camAngle_camPath,
|
||||
&camAngle_camPath_001,
|
||||
&camAngle_camPath_002,
|
||||
&camAngle_camPath_003,
|
||||
&camAngle_camPath_004,
|
||||
&camAngle_camPath_005,
|
||||
};
|
||||
|
||||
NODE nodegnd_003;
|
||||
|
||||
NODE nodegnd_001;
|
||||
|
||||
NODE nodegnd_002;
|
||||
|
||||
NODE nodegnd;
|
||||
|
||||
SIBLINGS nodegnd_003_siblings = {
|
||||
1,
|
||||
{
|
||||
@ -11451,10 +11389,10 @@ NODE nodegnd = {
|
||||
};
|
||||
|
||||
MESH * actorPtr = &meshSphere;
|
||||
MESH * levelPtr = &meshgnd;
|
||||
MESH * levelPtr = &meshgnd_002;
|
||||
MESH * propPtr = &meshSphere_001;
|
||||
|
||||
CAMANGLE * camPtr = &camAngle_camPath_001;
|
||||
|
||||
NODE * curNode = &nodegnd;
|
||||
NODE * curNode = &nodegnd_002;
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
"emulator": {
|
||||
"8Megs": false,
|
||||
"AutoVideo": true,
|
||||
"Bios": "/home/arthus/.epsxe/bios/openbios.bin",
|
||||
"Bios": "/home/arthus/build/pcsx-redux/src/mips/openbios/openbios.bin",
|
||||
"BnWMdec": false,
|
||||
"CDDA": 1,
|
||||
"Debug": true,
|
||||
@ -22,7 +22,7 @@
|
||||
"GdbServer": true,
|
||||
"GdbServerPort": 3333,
|
||||
"GdbServerTrace": false,
|
||||
"IsoPath": "/home/arthus/build/psx-stuff/roms/UNIROM_RELEASE_8.0.D",
|
||||
"IsoPath": "/home/arthus/Jeux/emul/psx/Vagrant Story (USA)",
|
||||
"Locale": "",
|
||||
"Logfile": "",
|
||||
"Mcd1": "memcard1.mcd",
|
||||
@ -31,7 +31,7 @@
|
||||
"Mcd2Inserted": true,
|
||||
"Overlay": [],
|
||||
"PpfDir": "",
|
||||
"PsxExe": "UNIROM_B.EXE;1",
|
||||
"PsxExe": "SLUS_010.40;1",
|
||||
"RCntFix": false,
|
||||
"SioIrq": false,
|
||||
"SpuIrq": false,
|
||||
@ -53,5 +53,5 @@
|
||||
"WindowSizeX": 719,
|
||||
"WindowSizeY": 542
|
||||
},
|
||||
"imgui": "[Window][Debug##Default]\nPos=60,60\nSize=400,400\nCollapsed=0\n\n[Window][Emulation Configuration]\nViewportPos=39,142\nViewportId=0xA515CB4B\nSize=316,619\nCollapsed=0\n\n[Window][Logs]\nViewportPos=-86,644\nViewportId=0x50BD6962\nSize=720,450\nCollapsed=0\n\n[Window][Soft GPU configuration]\nPos=288,182\nSize=300,200\nCollapsed=0\n\n[Window][Main VRAM Viewer]\nViewportPos=1157,-262\nViewportId=0xD2F1ACB4\nSize=1321,900\nCollapsed=0\n\n[Window][Registers]\nViewportPos=1244,-4\nViewportId=0xA4D966FE\nSize=493,512\nCollapsed=0\nDockId=0x00000002,0\n\n[Window][Breakpoints]\nViewportPos=1283,-4\nViewportId=0xA4D966FE\nPos=250,0\nSize=243,512\nCollapsed=0\nDockId=0x00000003,0\n\n[Window][Assembly]\nViewportPos=1077,89\nViewportId=0xE37F8D5D\nSize=623,751\nCollapsed=0\n\n[Window][Output]\nPos=160,48\nSize=810,532\nCollapsed=0\n\n[Window][About]\nPos=199,66\nSize=880,600\nCollapsed=0\n\n[Window][Dear ImGui Demo]\nPos=669,25\nSize=550,680\nCollapsed=0\n\n[Window][SPU configuration]\nPos=69,56\nSize=550,220\nCollapsed=0\n\n[Window][SPU Debug]\nViewportPos=962,725\nViewportId=0xE5F7C643\nSize=1200,430\nCollapsed=0\n\n[Window][Memory Editor #1]\nViewportPos=1139,76\nViewportId=0xE9869392\nSize=584,539\nCollapsed=0\n\n[Window][Source]\nViewportPos=61,86\nViewportId=0x58267A45\nSize=416,536\nCollapsed=0\n\n[Window][Callstack]\nViewportPos=48,90\nViewportId=0xA9FDEE8E\nSize=426,525\nCollapsed=0\n\n[Window][Dwarf]\nPos=60,60\nSize=404,388\nCollapsed=0\n\n[Window][Symbols]\nPos=60,60\nSize=147,62\nCollapsed=0\n\n[Window][Scratch Pad]\nViewportPos=719,-7\nViewportId=0xB7AD35A5\nSize=484,480\nCollapsed=0\n\n[Window][Hardware Registers]\nViewportPos=847,221\nViewportId=0x311B7332\nSize=584,612\nCollapsed=0\n\n[Window][CLUT VRAM selector]\nViewportPos=737,320\nViewportId=0xF0235A86\nPos=0,5\nSize=330,252\nCollapsed=0\n\n[Docking][Data]\nDockNode ID=0x00000001 Pos=1244,-4 Size=493,512 Split=X\n DockNode ID=0x00000002 Parent=0x00000001 SizeRef=105,512 Selected=0x837A6095\n DockNode ID=0x00000003 Parent=0x00000001 SizeRef=103,512 Selected=0x0263173C\n\n"
|
||||
"imgui": "[Window][Debug##Default]\nPos=60,60\nSize=400,400\nCollapsed=0\n\n[Window][Emulation Configuration]\nViewportPos=882,165\nViewportId=0xA515CB4B\nSize=316,619\nCollapsed=0\n\n[Window][Logs]\nViewportPos=-158,629\nViewportId=0x50BD6962\nSize=720,450\nCollapsed=0\n\n[Window][Soft GPU configuration]\nPos=288,182\nSize=300,200\nCollapsed=0\n\n[Window][Main VRAM Viewer]\nViewportPos=1157,-262\nViewportId=0xD2F1ACB4\nSize=1321,900\nCollapsed=0\n\n[Window][Registers]\nViewportPos=1244,-4\nViewportId=0xA4D966FE\nSize=493,512\nCollapsed=0\nDockId=0x00000002,0\n\n[Window][Breakpoints]\nViewportPos=1244,-4\nViewportId=0xA4D966FE\nSize=639,660\nCollapsed=0\nDockId=0x00000003,0\n\n[Window][Assembly]\nViewportPos=1077,89\nViewportId=0xE37F8D5D\nSize=623,751\nCollapsed=0\n\n[Window][Output]\nPos=160,48\nSize=810,532\nCollapsed=0\n\n[Window][About]\nPos=199,66\nSize=880,600\nCollapsed=0\n\n[Window][Dear ImGui Demo]\nPos=669,25\nSize=550,680\nCollapsed=0\n\n[Window][SPU configuration]\nPos=69,56\nSize=550,220\nCollapsed=0\n\n[Window][SPU Debug]\nViewportPos=962,725\nViewportId=0xE5F7C643\nSize=1200,430\nCollapsed=0\n\n[Window][Memory Editor #1]\nViewportPos=1139,76\nViewportId=0xE9869392\nSize=584,539\nCollapsed=0\n\n[Window][Source]\nViewportPos=61,86\nViewportId=0x58267A45\nSize=416,536\nCollapsed=0\n\n[Window][Callstack]\nViewportPos=48,90\nViewportId=0xA9FDEE8E\nSize=426,525\nCollapsed=0\n\n[Window][Dwarf]\nPos=60,60\nSize=404,388\nCollapsed=0\n\n[Window][Symbols]\nPos=60,60\nSize=147,62\nCollapsed=0\n\n[Window][Scratch Pad]\nViewportPos=719,-7\nViewportId=0xB7AD35A5\nSize=484,480\nCollapsed=0\n\n[Window][Hardware Registers]\nViewportPos=847,221\nViewportId=0x311B7332\nSize=584,612\nCollapsed=0\n\n[Window][CLUT VRAM selector]\nViewportPos=737,320\nViewportId=0xF0235A86\nPos=0,5\nSize=330,252\nCollapsed=0\n\n[Docking][Data]\nDockNode ID=0x00000001 Pos=1244,-4 Size=639,660 Split=X\n DockNode ID=0x00000002 Parent=0x00000001 SizeRef=105,512 Selected=0x837A6095\n DockNode ID=0x00000003 Parent=0x00000001 SizeRef=103,512 Selected=0x0263173C\n\n"
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user