screenToWorld, worldToScreen fncs

This commit is contained in:
ABelliqueux 2021-03-29 11:44:06 +02:00
parent 735295c197
commit 0d083c9580

View File

@ -240,24 +240,6 @@ int lerping = 0;
short curCamAngle = 0;
// Cam frustum
//~ VECTOR TL = { -CENTERX, -CENTERY, FOV };
//~ VECTOR TR = { CENTERX, -CENTERY, FOV };
//~ VECTOR BR = { CENTERX, CENTERY, FOV };
//~ VECTOR BL = { -CENTERX, CENTERY, FOV };
VECTOR TL = { -HW, -HH, ONE };
VECTOR TR = { HW, -HH, ONE };
VECTOR BR = { HW, HH, ONE };
VECTOR BL = { -HW, HH, ONE };
// Inverted Cam coordinates for Forward Vector calc
VECTOR InvCamPos = {0,0,0,0};
@ -318,6 +300,10 @@ VECTOR getVectorTo(VECTOR actor, VECTOR target);
int alignAxisToVect(VECTOR target, short axis, int factor);
void worldToScreen( VECTOR * worldPos, VECTOR * screenPos );
void screenToWorld( VECTOR * screenPos, VECTOR * worldPos );
// Drawing
void transformMesh(MESH * meshes);
@ -352,6 +338,9 @@ void callback();
int main() {
VECTOR sp = {0,0,0};
VECTOR wp = {0,0,0};
// FIXME : Poly subdiv
//~ DIVPOLYGON4 div4 = { 0 };
@ -587,7 +576,7 @@ int main() {
// Fixed Camera angle
if (camMode == 2) {
//~ if (camPtr->tim_data){
if (camPtr->tim_data){
//~ drawBG();
@ -614,6 +603,8 @@ int main() {
}
}
setCameraPos(camPtr->campos->pos, camPtr->campos->rot);
}
@ -910,6 +901,8 @@ int main() {
// }
}
worldToScreen(actorPtr->pos, &actorPtr->pos2D);
// Camera setup
// position of cam relative to actor
@ -932,8 +925,6 @@ int main() {
//~ // Loop on camAngles
//~ for ( int angle = 0 ; angle < sizeof(camAngles)/sizeof(camAngles[0]) - 1 ; angle++ ) {
for ( int mesh = 0 ; mesh < camAngles[curCamAngle]->index; mesh ++ ) {
transformMesh(camAngles[curCamAngle]->objects[mesh]);
@ -943,8 +934,6 @@ int main() {
}
//~ }
//~ }
}
else {
@ -1017,19 +1006,17 @@ int main() {
//~ FntPrint("CurNode : %x\nIndex: %d", curNode, curNode->siblings->index);
screenToWorld(&sp, &wp);
FntPrint("Time : %d dt :%d\n", VSync(-1) / 60, dt);
FntPrint("Actor : %d %d\n", actorPtr->pos2D.vx + actorPtr->body->max.vx / 2, actorPtr->pos2D.vy);
//~ FntPrint("%d %d %d\n", normalizeVector(&TL));
//~ FntPrint("%d %d %d\n", normalizeVector(&TR));
//~ FntPrint("%d %d %d\n", normalizeVector(&BR));
//~ FntPrint("%d %d %d\n", normalizeVector(&BL));
//~ FntPrint("%d %d\n", actorPtr->pos->vx, actorPtr->pos2D.vx);
//~ FntPrint("%d %d\n", actorPtr->pos->vy, actorPtr->pos2D.vy);
//~ FntPrint("%d %d\n", actorPtr->pos->vz, actorPtr->pos2D.vz);
FntPrint("%d - %d %d %d\n", sp.vx , wp.vx, wp.vy, wp.vz);
FntFlush(-1);
@ -1161,25 +1148,25 @@ void LoadTexture(u_long * tim, TIM_IMAGE * tparam){ // This part is from Lam
void transformMesh(MESH * mesh){
//~ if (*mesh->isRigidBody || *mesh->isStaticBody){
MATRIX mat;
// Apply rotation matrix
RotMatrix_gte(mesh->rot, mesh->mat);
RotMatrix_gte(mesh->rot, &mat);
// Apply translation matrix
TransMatrix(mesh->mat, mesh->pos);
TransMatrix(&mat, mesh->pos);
// Compose matrix with cam
CompMatrix(&camera.mat, mesh->mat, mesh->mat);
CompMatrix(&camera.mat, &mat, &mat);
// Set default rotation and translation matrices
SetRotMatrix(mesh->mat);
SetRotMatrix(&mat);
SetTransMatrix(mesh->mat);
SetTransMatrix(&mat);
//~ }
};
@ -1467,10 +1454,10 @@ void drawPoly(MESH * mesh, long * Flag, int atime){
AddPrim(&ot[db][*mesh->OTz-2], poly);
}
mesh->pos2D.vx = *(&poly->x0);
mesh->pos2D.vy = *(&poly->x0 + 1);
//~ mesh->pos2D.vy = poly->x0;
//~ FntPrint("%d %d\n", *(&poly->x0), *(&poly->x0 + 1));
//~ mesh->pos2D.vx = *(&poly->x0);
//~ mesh->pos2D.vy = *(&poly->x0 + 1);
// mesh->pos2D.vy = poly->x0;
// FntPrint("%d %d\n", *(&poly->x0), *(&poly->x0 + 1));
nextpri += sizeof(POLY_GT3);
}
@ -1973,6 +1960,75 @@ VECTOR getVectorTo( VECTOR actor, VECTOR target ) {
};
// From 'psyq/addons/graphics/ZIMEN/CLIP.C'
void worldToScreen( VECTOR * worldPos, VECTOR * screenPos ) {
int distToScreen; // corresponds to FOV
MATRIX curRot; // current rotation matrix
// Get current matrix and projection */
distToScreen = ReadGeomScreen();
ReadRotMatrix(&curRot);
// Get Rotation, Translation coordinates, apply perspective correction
// Muliply world coordinates vector by current rotation matrix, store in s
ApplyMatrixLV(&curRot, worldPos, screenPos);
// Get world translation vectors from rot and add to s.vx, vy, vz
applyVector(screenPos, curRot.t[0], curRot.t[1], curRot.t[2], +=);
// Correct perspective
screenPos -> vz = distToScreen; // Start with vz to avoid division by 0 below
screenPos -> vx = screenPos -> vx * distToScreen / ( screenPos -> vz );
screenPos -> vy = screenPos -> vy * distToScreen / ( screenPos -> vz );
};
void screenToWorld( VECTOR * screenPos, VECTOR * worldPos ) {
int distToScreen; // corresponds to FOV
MATRIX curRot, rotT; // current rotation matrix
VECTOR curTrans;
// Get current matrix and projection */
distToScreen = ReadGeomScreen();
ReadRotMatrix(&curRot);
PushMatrix();
// Get current translation
curTrans.vx = screenPos->vx - curRot.t[0];
curTrans.vy = screenPos->vy - curRot.t[1];
curTrans.vz = screenPos->vz - curRot.t[2];
TransposeMatrix(&curRot, &rotT);
//
ApplyMatrixLV(&rotT, &curTrans, worldPos);
PopMatrix();
};
//~ int alignAxisToVect(VECTOR target, short axis, int factor){
//~ }