archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2026-06-26 20:45:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

implemented col line rendering

Browse Source
This commit is contained in:
aap
2019-07-19 13:58:19 +02:00
parent 59145cea83
commit 0ad39c020c
14 changed files with 354 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/Collision.cpp
+234 -7
View File
@@ -18,6 +18,7 @@
#include "CutsceneMgr.h"
#include "RenderBuffer.h"
#include "SurfaceTable.h"
#include "Lines.h"
#include "Collision.h"
enum Direction
@@ -1387,6 +1388,223 @@ CCollision::CalculateTrianglePlanes(CColModel *model)
void
CCollision::DrawColModel(const CMatrix &mat, const CColModel &colModel)
{
int i;
CVector min, max;
CVector verts[8];
CVector c;
float r;
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil);
min = colModel.boundingBox.min;
max = colModel.boundingBox.max;
verts[0] = mat * CVector(min.x, min.y, min.z);
verts[1] = mat * CVector(min.x, min.y, max.z);
verts[2] = mat * CVector(min.x, max.y, min.z);
verts[3] = mat * CVector(min.x, max.y, max.z);
verts[4] = mat * CVector(max.x, min.y, min.z);
verts[5] = mat * CVector(max.x, min.y, max.z);
verts[6] = mat * CVector(max.x, max.y, min.z);
verts[7] = mat * CVector(max.x, max.y, max.z);
CLines::RenderLineWithClipping(
verts[0].x, verts[0].y, verts[0].z,
verts[1].x, verts[1].y, verts[1].z,
0xFF0000FF, 0xFF0000FF);
CLines::RenderLineWithClipping(
verts[1].x, verts[1].y, verts[1].z,
verts[3].x, verts[3].y, verts[3].z,
0xFF0000FF, 0xFF0000FF);
CLines::RenderLineWithClipping(
verts[3].x, verts[3].y, verts[3].z,
verts[2].x, verts[2].y, verts[2].z,
0xFF0000FF, 0xFF0000FF);
CLines::RenderLineWithClipping(
verts[2].x, verts[2].y, verts[2].z,
verts[0].x, verts[0].y, verts[0].z,
0xFF0000FF, 0xFF0000FF);
CLines::RenderLineWithClipping(
verts[4].x, verts[4].y, verts[4].z,
verts[5].x, verts[5].y, verts[5].z,
0xFF0000FF, 0xFF0000FF);
CLines::RenderLineWithClipping(
verts[5].x, verts[5].y, verts[5].z,
verts[7].x, verts[7].y, verts[7].z,
0xFF0000FF, 0xFF0000FF);
CLines::RenderLineWithClipping(
verts[7].x, verts[7].y, verts[7].z,
verts[6].x, verts[6].y, verts[6].z,
0xFF0000FF, 0xFF0000FF);
CLines::RenderLineWithClipping(
verts[6].x, verts[6].y, verts[6].z,
verts[4].x, verts[4].y, verts[4].z,
0xFF0000FF, 0xFF0000FF);
CLines::RenderLineWithClipping(
verts[0].x, verts[0].y, verts[0].z,
verts[4].x, verts[4].y, verts[4].z,
0xFF0000FF, 0xFF0000FF);
CLines::RenderLineWithClipping(
verts[1].x, verts[1].y, verts[1].z,
verts[5].x, verts[5].y, verts[5].z,
0xFF0000FF, 0xFF0000FF);
CLines::RenderLineWithClipping(
verts[2].x, verts[2].y, verts[2].z,
verts[6].x, verts[6].y, verts[6].z,
0xFF0000FF, 0xFF0000FF);
CLines::RenderLineWithClipping(
verts[3].x, verts[3].y, verts[3].z,
verts[7].x, verts[7].y, verts[7].z,
0xFF0000FF, 0xFF0000FF);
for(i = 0; i < colModel.numSpheres; i++){
c = mat * colModel.spheres[i].center;
r = colModel.spheres[i].radius;
CLines::RenderLineWithClipping(
c.x, c.y, c.z-r,
c.x-r, c.y-r, c.z,
0xFF00FFFF, 0xFF00FFFF);
CLines::RenderLineWithClipping(
c.x, c.y, c.z-r,
c.x-r, c.y+r, c.z,
0xFF00FFFF, 0xFF00FFFF);
CLines::RenderLineWithClipping(
c.x, c.y, c.z-r,
c.x+r, c.y-r, c.z,
0xFF00FFFF, 0xFF00FFFF);
CLines::RenderLineWithClipping(
c.x, c.y, c.z-r,
c.x+r, c.y+r, c.z,
0xFF00FFFF, 0xFF00FFFF);
CLines::RenderLineWithClipping(
c.x-r, c.y-r, c.z,
c.x, c.y, c.z+r,
0xFF00FFFF, 0xFF00FFFF);
CLines::RenderLineWithClipping(
c.x-r, c.y+r, c.z,
c.x, c.y, c.z+r,
0xFF00FFFF, 0xFF00FFFF);
CLines::RenderLineWithClipping(
c.x+r, c.y-r, c.z,
c.x, c.y, c.z+r,
0xFF00FFFF, 0xFF00FFFF);
CLines::RenderLineWithClipping(
c.x+r, c.y+r, c.z,
c.x, c.y, c.z+r,
0xFF00FFFF, 0xFF00FFFF);
}
for(i = 0; i < colModel.numLines; i++){
verts[0] = colModel.lines[i].p0;
verts[1] = colModel.lines[i].p1;
verts[0] = mat * verts[0];
verts[1] = mat * verts[1];
CLines::RenderLineWithClipping(
verts[0].x, verts[0].y, verts[0].z,
verts[1].x, verts[1].y, verts[1].z,
0x00FFFFFF, 0x00FFFFFF);
}
for(i = 0; i < colModel.numBoxes; i++){
min = colModel.boxes[i].min;
max = colModel.boxes[i].max;
verts[0] = mat * CVector(min.x, min.y, min.z);
verts[1] = mat * CVector(min.x, min.y, max.z);
verts[2] = mat * CVector(min.x, max.y, min.z);
verts[3] = mat * CVector(min.x, max.y, max.z);
verts[4] = mat * CVector(max.x, min.y, min.z);
verts[5] = mat * CVector(max.x, min.y, max.z);
verts[6] = mat * CVector(max.x, max.y, min.z);
verts[7] = mat * CVector(max.x, max.y, max.z);
CLines::RenderLineWithClipping(
verts[0].x, verts[0].y, verts[0].z,
verts[1].x, verts[1].y, verts[1].z,
0xFFFFFFFF, 0xFFFFFFFF);
CLines::RenderLineWithClipping(
verts[1].x, verts[1].y, verts[1].z,
verts[3].x, verts[3].y, verts[3].z,
0xFFFFFFFF, 0xFFFFFFFF);
CLines::RenderLineWithClipping(
verts[3].x, verts[3].y, verts[3].z,
verts[2].x, verts[2].y, verts[2].z,
0xFFFFFFFF, 0xFFFFFFFF);
CLines::RenderLineWithClipping(
verts[2].x, verts[2].y, verts[2].z,
verts[0].x, verts[0].y, verts[0].z,
0xFFFFFFFF, 0xFFFFFFFF);
CLines::RenderLineWithClipping(
verts[4].x, verts[4].y, verts[4].z,
verts[5].x, verts[5].y, verts[5].z,
0xFFFFFFFF, 0xFFFFFFFF);
CLines::RenderLineWithClipping(
verts[5].x, verts[5].y, verts[5].z,
verts[7].x, verts[7].y, verts[7].z,
0xFFFFFFFF, 0xFFFFFFFF);
CLines::RenderLineWithClipping(
verts[7].x, verts[7].y, verts[7].z,
verts[6].x, verts[6].y, verts[6].z,
0xFFFFFFFF, 0xFFFFFFFF);
CLines::RenderLineWithClipping(
verts[6].x, verts[6].y, verts[6].z,
verts[4].x, verts[4].y, verts[4].z,
0xFFFFFFFF, 0xFFFFFFFF);
CLines::RenderLineWithClipping(
verts[0].x, verts[0].y, verts[0].z,
verts[4].x, verts[4].y, verts[4].z,
0xFFFFFFFF, 0xFFFFFFFF);
CLines::RenderLineWithClipping(
verts[1].x, verts[1].y, verts[1].z,
verts[5].x, verts[5].y, verts[5].z,
0xFFFFFFFF, 0xFFFFFFFF);
CLines::RenderLineWithClipping(
verts[2].x, verts[2].y, verts[2].z,
verts[6].x, verts[6].y, verts[6].z,
0xFFFFFFFF, 0xFFFFFFFF);
CLines::RenderLineWithClipping(
verts[3].x, verts[3].y, verts[3].z,
verts[7].x, verts[7].y, verts[7].z,
0xFFFFFFFF, 0xFFFFFFFF);
}
for(i = 0; i < colModel.numTriangles; i++){
colModel.GetTrianglePoint(verts[0], colModel.triangles[i].a);
colModel.GetTrianglePoint(verts[1], colModel.triangles[i].b);
colModel.GetTrianglePoint(verts[2], colModel.triangles[i].c);
verts[0] = mat * verts[0];
verts[1] = mat * verts[1];
verts[2] = mat * verts[2];
CLines::RenderLineWithClipping(
verts[0].x, verts[0].y, verts[0].z,
verts[1].x, verts[1].y, verts[1].z,
0x00FF00FF, 0x00FF00FF);
CLines::RenderLineWithClipping(
verts[0].x, verts[0].y, verts[0].z,
verts[2].x, verts[2].y, verts[2].z,
0x00FF00FF, 0x00FF00FF);
CLines::RenderLineWithClipping(
verts[1].x, verts[1].y, verts[1].z,
verts[2].x, verts[2].y, verts[2].z,
0x00FF00FF, 0x00FF00FF);
}
RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
}
void
@@ -1407,7 +1625,6 @@ CCollision::DrawColModel_Coloured(const CMatrix &mat, const CColModel &colModel,
RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil);
extern int gDbgSurf;
for(i = 0; i < colModel.numTriangles; i++){
colModel.GetTrianglePoint(verts[0], colModel.triangles[i].a);
@@ -1417,7 +1634,7 @@ extern int gDbgSurf;
verts[1] = mat * verts[1];
verts[2] = mat * verts[2];
// TODO: surface
// game doesn't do this
r = 255;
g = 128;
b = 0;
@@ -1457,10 +1674,15 @@ extern int gDbgSurf;
b *= f;
}
// TODO: make some surface types flicker?
//if(s != gDbgSurf) continue;
if(s == SURFACE_SCAFFOLD || s == SURFACE_METAL_FENCE ||
s == SURFACE_BOLLARD || s == SURFACE_METAL_POLE)
if(CTimer::GetFrameCounter() & 1){
r = 0;
g = 0;
b = 0;
}
if(s > SURFACE_32){
if(s > SURFACE_GATE){
r = CGeneral::GetRandomNumber();
g = CGeneral::GetRandomNumber();
b = CGeneral::GetRandomNumber();
@@ -1533,8 +1755,13 @@ extern int gDbgSurf;
b *= f;
}
// TODO: make some surface types flicker?
//if(s != gDbgSurf) continue;
if(s == SURFACE_SCAFFOLD || s == SURFACE_METAL_FENCE ||
s == SURFACE_BOLLARD || s == SURFACE_METAL_POLE)
if(CTimer::GetFrameCounter() & 1){
r = 0;
g = 0;
b = 0;
}
RenderBuffer::StartStoring(36, 8, &iptr, &vptr);
RwIm3DVertexSetRGBA(&vptr[0], r, g, b, 255);
src/core/Pad.h
-2
View File
@@ -381,5 +381,3 @@ extern CPad *Pads; //[2]
#define IsButtonJustDown(pad, btn) \
(!(pad)->OldState.btn && (pad)->NewState.btn)
void LittleTest(void);
src/core/SurfaceTable.h
+2
View File
@@ -77,6 +77,8 @@ enum eSurfaceType
SURFACE_LOOSE30,
SURFACE_BOLLARD,
SURFACE_GATE,
// These are illegal
SURFACE_SAND33,
SURFACE_ROAD34,
};
src/core/main.cpp
+2
View File
@@ -295,6 +295,8 @@ void
RenderDebugShit(void)
{
// CTheScripts::RenderTheScriptDebugLines()
if(gbShowCollisionLines)
CRenderer::RenderCollisionLines();
}
void
src/core/main.h
+2
View File
@@ -26,3 +26,5 @@ void LoadingIslandScreen(const char *levelName);
CSprite2d *LoadSplash(const char *name);
char *GetLevelSplashScreen(int level);
char *GetRandomSplashScreen(void);
void LittleTest(void);
src/core/re3.cpp
+2 -3
View File
@@ -58,8 +58,6 @@ mysrand(unsigned int seed)
myrand_seed = seed;
}
int gDbgSurf;
void (*DebugMenuProcess)(void);
void (*DebugMenuRender)(void);
static void stub(void) { }
@@ -246,12 +244,13 @@ DebugMenuPopulate(void)
DebugMenuAddVarBool8("Debug", "Show Ped Road Groups", (int8*)&gbShowPedRoadGroups, nil);
DebugMenuAddVarBool8("Debug", "Show Car Road Groups", (int8*)&gbShowCarRoadGroups, nil);
DebugMenuAddVarBool8("Debug", "Show Collision Lines", (int8*)&gbShowCollisionLines, nil);
DebugMenuAddVarBool8("Debug", "Show Collision Polys", (int8*)&gbShowCollisionPolys, nil);
DebugMenuAddVarBool8("Debug", "Don't render Buildings", (int8*)&gbDontRenderBuildings, nil);
DebugMenuAddVarBool8("Debug", "Don't render Big Buildings", (int8*)&gbDontRenderBigBuildings, nil);
DebugMenuAddVarBool8("Debug", "Don't render Peds", (int8*)&gbDontRenderPeds, nil);
DebugMenuAddVarBool8("Debug", "Don't render Vehicles", (int8*)&gbDontRenderVehicles, nil);
DebugMenuAddVarBool8("Debug", "Don't render Objects", (int8*)&gbDontRenderObjects, nil);
DebugMenuAddVar("Debug", "Dbg Surface", &gDbgSurf, nil, 1, 0, 34, nil);
DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);
DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop);