Start checkpoint rendering
This commit is contained in:
parent
e23fb2657a
commit
2c5162b635
5 changed files with 157 additions and 84 deletions
205
renderer.h
205
renderer.h
|
|
@ -35,6 +35,17 @@
|
|||
kinda hotfixes it -- later try to discover source of this bug. TODO */
|
||||
#define _LCR_MAP_MODEL_SCALE 1034
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#define LCR_RENDERER_MAT_CP0 0x0f
|
||||
#define LCR_RENDERER_MAT_CP1 0x0e
|
||||
#define LCR_RENDERER_MAT_FIN 0x0d
|
||||
|
||||
|
||||
|
||||
struct
|
||||
{
|
||||
S3L_Scene scene;
|
||||
|
|
@ -128,7 +139,6 @@ void _LCR_pixelFunc3D(S3L_PixelInfo *pixel)
|
|||
else if (pixel->modelIndex == 8)
|
||||
{
|
||||
// car model
|
||||
|
||||
LCR_loadImage(LCR_IMAGE_CAR);
|
||||
|
||||
for (int i = 0; i < 6; ++i)
|
||||
|
|
@ -156,56 +166,75 @@ void _LCR_pixelFunc3D(S3L_PixelInfo *pixel)
|
|||
pixel->modelIndex]];
|
||||
|
||||
uint8_t type = triData[pixel->triangleIndex] >> 4;
|
||||
uint8_t mat = triData[pixel->triangleIndex] & 0x0f;
|
||||
|
||||
LCR_loadImage(triData[pixel->triangleIndex] & 0x0f);
|
||||
|
||||
if (type == 0) // floor?
|
||||
switch (mat)
|
||||
{
|
||||
if (v[0][1] != v[1][1] || v[1][1] != v[2][1]) // angled floor?
|
||||
LCR_imageChangeBrightness(1);
|
||||
case LCR_RENDERER_MAT_CP0:
|
||||
LCR_renderer.flatAndTransparent = LCR_SETTING_CHECKPOINT0_COLOR;
|
||||
break;
|
||||
|
||||
for (int i = 0; i < 6; ++i)
|
||||
LCR_renderer.triUVs[i] = ((
|
||||
(v[i / 2][(i % 2) * 2]) *
|
||||
LCR_IMAGE_SIZE) / LCR_RENDERER_UNIT);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (type == 1)
|
||||
LCR_imageChangeBrightness(0);
|
||||
case LCR_RENDERER_MAT_CP1:
|
||||
LCR_renderer.flatAndTransparent = LCR_SETTING_CHECKPOINT1_COLOR;
|
||||
break;
|
||||
|
||||
for (int i = 0; i < 6; ++i)
|
||||
{
|
||||
LCR_renderer.triUVs[i] = ((
|
||||
(v[i / 2][i % 2 ? 1 : (type == 1 ? 2 : 0)]) *
|
||||
LCR_IMAGE_SIZE) / LCR_RENDERER_UNIT);
|
||||
case LCR_RENDERER_MAT_FIN:
|
||||
LCR_renderer.flatAndTransparent = LCR_SETTING_FINISH_COLOR;
|
||||
break;
|
||||
|
||||
if (i % 2)
|
||||
LCR_renderer.triUVs[i] = LCR_IMAGE_SIZE -
|
||||
LCR_renderer.triUVs[i];
|
||||
}
|
||||
default:
|
||||
LCR_loadImage(mat);
|
||||
|
||||
if (type == 0) // floor?
|
||||
{
|
||||
if (v[0][1] != v[1][1] || v[1][1] != v[2][1]) // angled floor?
|
||||
LCR_imageChangeBrightness(1);
|
||||
|
||||
for (int i = 0; i < 6; ++i)
|
||||
LCR_renderer.triUVs[i] = ((
|
||||
(v[i / 2][(i % 2) * 2]) *
|
||||
LCR_IMAGE_SIZE) / LCR_RENDERER_UNIT);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (type == 1)
|
||||
LCR_imageChangeBrightness(0);
|
||||
|
||||
for (int i = 0; i < 6; ++i)
|
||||
{
|
||||
LCR_renderer.triUVs[i] = ((
|
||||
(v[i / 2][i % 2 ? 1 : (type == 1 ? 2 : 0)]) *
|
||||
LCR_IMAGE_SIZE) / LCR_RENDERER_UNIT);
|
||||
|
||||
if (i % 2)
|
||||
LCR_renderer.triUVs[i] = LCR_IMAGE_SIZE -
|
||||
LCR_renderer.triUVs[i];
|
||||
}
|
||||
}
|
||||
|
||||
// shift the UVs to the origin (prevent high values of UV coords)
|
||||
for (int i = 0; i < 2; ++i)
|
||||
{
|
||||
uint8_t minCoord = LCR_renderer.triUVs[i] <
|
||||
LCR_renderer.triUVs[2 + i] ? (0 + i) : (2 + i);
|
||||
|
||||
if (LCR_renderer.triUVs[4 + i] < LCR_renderer.triUVs[minCoord])
|
||||
minCoord = 4 + i;
|
||||
|
||||
S3L_Unit shiftBy = LCR_renderer.triUVs[minCoord] % LCR_IMAGE_SIZE;
|
||||
|
||||
if (shiftBy < 0)
|
||||
shiftBy += LCR_IMAGE_SIZE;
|
||||
|
||||
shiftBy -= LCR_renderer.triUVs[minCoord];
|
||||
|
||||
LCR_renderer.triUVs[i] += shiftBy;
|
||||
LCR_renderer.triUVs[2 + i] += shiftBy;
|
||||
LCR_renderer.triUVs[4 + i] += shiftBy;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
// shift the UVs to the origin (prevent high values of UV coords)
|
||||
for (int i = 0; i < 2; ++i)
|
||||
{
|
||||
uint8_t minCoord = LCR_renderer.triUVs[i] <
|
||||
LCR_renderer.triUVs[2 + i] ? (0 + i) : (2 + i);
|
||||
|
||||
if (LCR_renderer.triUVs[4 + i] < LCR_renderer.triUVs[minCoord])
|
||||
minCoord = 4 + i;
|
||||
|
||||
S3L_Unit shiftBy = LCR_renderer.triUVs[minCoord] % LCR_IMAGE_SIZE;
|
||||
|
||||
if (shiftBy < 0)
|
||||
shiftBy += LCR_IMAGE_SIZE;
|
||||
|
||||
shiftBy -= LCR_renderer.triUVs[minCoord];
|
||||
|
||||
LCR_renderer.triUVs[i] += shiftBy;
|
||||
LCR_renderer.triUVs[2 + i] += shiftBy;
|
||||
LCR_renderer.triUVs[4 + i] += shiftBy;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -213,7 +242,7 @@ void _LCR_pixelFunc3D(S3L_PixelInfo *pixel)
|
|||
{
|
||||
if (pixel->x % 2 == pixel->y % 2)
|
||||
LCR_drawPixelXYUnsafe(pixel->x,pixel->y,LCR_renderer.flatAndTransparent);
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -680,52 +709,62 @@ uint8_t _LCR_buildMapModel(void)
|
|||
// don't add triangles completely at the floor or ceiling of the map
|
||||
if (!edgeBits)
|
||||
{
|
||||
uint8_t triData;
|
||||
|
||||
if (blockType == LCR_BLOCK_CHECKPOINT_0)
|
||||
triData = LCR_RENDERER_MAT_CP0;
|
||||
else if (blockType == LCR_BLOCK_FINISH)
|
||||
triData = LCR_RENDERER_MAT_FIN;
|
||||
else
|
||||
{
|
||||
uint8_t blockMat = LCR_mapBlockGetMaterial(block);
|
||||
|
||||
#define VERT(n,c) LCR_renderer.mapVerts[3 * n + c]
|
||||
uint8_t blockMat = LCR_mapBlockGetMaterial(block);
|
||||
uint8_t triData =
|
||||
(((VERT(triIndices[0],0) == VERT(triIndices[1],0)) &&
|
||||
(VERT(triIndices[1],0) == VERT(triIndices[2],0))) << 4) |
|
||||
(((VERT(triIndices[0],2) == VERT(triIndices[1],2)) &&
|
||||
(VERT(triIndices[1],2) == VERT(triIndices[2],2))) << 5);
|
||||
triData =
|
||||
(((VERT(triIndices[0],0) == VERT(triIndices[1],0)) &&
|
||||
(VERT(triIndices[1],0) == VERT(triIndices[2],0))) << 4) |
|
||||
(((VERT(triIndices[0],2) == VERT(triIndices[1],2)) &&
|
||||
(VERT(triIndices[1],2) == VERT(triIndices[2],2))) << 5);
|
||||
#undef VERT
|
||||
|
||||
if (triData & 0xf0) // wall?
|
||||
{
|
||||
triData |=
|
||||
((blockMat == LCR_BLOCK_MATERIAL_CONCRETE) ||
|
||||
(blockMat == LCR_BLOCK_MATERIAL_ICE) ||
|
||||
(blockType == LCR_BLOCK_FULL_ACCEL) ||
|
||||
(blockType == LCR_BLOCK_FULL_FAN)) ?
|
||||
LCR_IMAGE_WALL_CONCRETE : LCR_IMAGE_WALL_WOOD;
|
||||
}
|
||||
else
|
||||
{ // TODO: tidy this mess?
|
||||
if (blockType == LCR_BLOCK_FULL_ACCEL)
|
||||
triData |= LCR_IMAGE_GROUND_ACCEL;
|
||||
else if (blockType == LCR_BLOCK_FULL_FAN)
|
||||
triData |= LCR_IMAGE_GROUND_FAN;
|
||||
if (triData & 0xf0) // wall?
|
||||
{
|
||||
triData |=
|
||||
((blockMat == LCR_BLOCK_MATERIAL_CONCRETE) ||
|
||||
(blockMat == LCR_BLOCK_MATERIAL_ICE) ||
|
||||
(blockType == LCR_BLOCK_FULL_ACCEL) ||
|
||||
(blockType == LCR_BLOCK_FULL_FAN)) ?
|
||||
LCR_IMAGE_WALL_CONCRETE : LCR_IMAGE_WALL_WOOD;
|
||||
}
|
||||
else
|
||||
switch (blockMat)
|
||||
{
|
||||
case LCR_BLOCK_MATERIAL_CONCRETE:
|
||||
triData |= LCR_IMAGE_GROUND_CONCRETE;
|
||||
break;
|
||||
{ // TODO: tidy this mess?
|
||||
if (blockType == LCR_BLOCK_FULL_ACCEL)
|
||||
triData |= LCR_IMAGE_GROUND_ACCEL;
|
||||
else if (blockType == LCR_BLOCK_FULL_FAN)
|
||||
triData |= LCR_IMAGE_GROUND_FAN;
|
||||
else
|
||||
switch (blockMat)
|
||||
{
|
||||
case LCR_BLOCK_MATERIAL_CONCRETE:
|
||||
triData |= LCR_IMAGE_GROUND_CONCRETE;
|
||||
break;
|
||||
|
||||
case LCR_BLOCK_MATERIAL_GRASS:
|
||||
triData |= LCR_IMAGE_GROUND_GRASS;
|
||||
break;
|
||||
case LCR_BLOCK_MATERIAL_GRASS:
|
||||
triData |= LCR_IMAGE_GROUND_GRASS;
|
||||
break;
|
||||
|
||||
case LCR_BLOCK_MATERIAL_DIRT:
|
||||
triData |= LCR_IMAGE_GROUND_DIRT;
|
||||
break;
|
||||
case LCR_BLOCK_MATERIAL_DIRT:
|
||||
triData |= LCR_IMAGE_GROUND_DIRT;
|
||||
break;
|
||||
|
||||
case LCR_BLOCK_MATERIAL_ICE:
|
||||
triData |= LCR_IMAGE_GROUND_ICE;
|
||||
break;
|
||||
case LCR_BLOCK_MATERIAL_ICE:
|
||||
triData |= LCR_IMAGE_GROUND_ICE;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
_LCR_rendererAddMapTri(triIndices[0],triIndices[1],triIndices[2],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue