|
@@ -35,6 +35,7 @@ typedef enum displayMode_t
|
|
|
DISPLAY_MODE_TEXTURED,
|
|
|
DISPLAY_MODE_TEXTURED_WIRE,
|
|
|
} displayMode_t;
|
|
|
+
|
|
|
bool displayVertex = false;
|
|
|
bool doNotCull = false;
|
|
|
enum displayMode_t currentDisplayMode = DISPLAY_MODE_SOLID;
|
|
@@ -61,7 +62,7 @@ void setup()
|
|
|
goto exit;
|
|
|
}
|
|
|
|
|
|
- frameBufferTexture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, windowWidth,
|
|
|
+ frameBufferTexture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA32, SDL_TEXTUREACCESS_STREAMING, windowWidth,
|
|
|
windowHeight);
|
|
|
if (frameBufferTexture == NULL)
|
|
|
{
|
|
@@ -76,9 +77,14 @@ void setup()
|
|
|
globalLight.direction.z = 1;
|
|
|
vec3Normalize(&globalLight.direction);
|
|
|
|
|
|
- meshTexture = (colour_t *)REDBRICK_TEXTURE;
|
|
|
|
|
|
- //loadOBJFile("assets/f22.obj");
|
|
|
+ /* Load texture */
|
|
|
+ //meshTexture = (colour_t *)REDBRICK_TEXTURE;
|
|
|
+ loadTextureDateFromPng("assets/cube.png");
|
|
|
+
|
|
|
+
|
|
|
+ /* Load object */
|
|
|
+ //loadOBJFile("assets/cube.obj");
|
|
|
loadCubeMeshData();
|
|
|
|
|
|
trianglesTotal = arrayGetSize(mesh.faces);
|
|
@@ -397,6 +403,7 @@ no_more_params:
|
|
|
}
|
|
|
|
|
|
arrayFree(projectedTriangles);
|
|
|
+ textureCleanup();
|
|
|
meshFree();
|
|
|
destroyWindow();
|
|
|
|