|
@@ -78,7 +78,7 @@ void setup()
|
|
|
vec3Normalize(&globalLight.direction);
|
|
|
|
|
|
/* Load object */
|
|
|
- loadOBJFile(&mesh,"assets/f117.obj");
|
|
|
+ loadOBJFile(&mesh,"assets/dragon.obj");
|
|
|
//loadCubeMeshData(&mesh);
|
|
|
|
|
|
/* Load texture */
|
|
@@ -133,8 +133,8 @@ void processInput()
|
|
|
case SDLK_ESCAPE: isRunning = false; break;
|
|
|
case SDLK_u: doNotCull = false; break;
|
|
|
case SDLK_j: doNotCull = true; break;
|
|
|
- case SDLK_i: doPerspectiveCorrection = false; break;
|
|
|
- case SDLK_k: doPerspectiveCorrection = true; break;
|
|
|
+ case SDLK_k: doPerspectiveCorrection = false; break;
|
|
|
+ case SDLK_i: doPerspectiveCorrection = true; break;
|
|
|
case SDLK_o: doZBuffer = true; break;
|
|
|
case SDLK_l: doZBuffer = false; break;
|
|
|
case SDLK_y: doClipping = true; break;
|
|
@@ -347,6 +347,8 @@ void render()
|
|
|
clearFrameBuffer(MAKE_RGB(0, 0, 0));
|
|
|
clearZBuffer();
|
|
|
|
|
|
+ drawGrid(20, MAKE_RGB(27, 2, 27));
|
|
|
+
|
|
|
int triangleCount = arrayGetSize(projectedTriangles);
|
|
|
|
|
|
for(i = 0; i < triangleCount; i++)
|
|
@@ -417,8 +419,8 @@ int main(int argc, char *argv[])
|
|
|
|
|
|
Log(TLOG_ALWAYS, NULL, "Booting 3D Engine (version %s)!", VERSION);
|
|
|
|
|
|
- windowWidth = 1024;
|
|
|
- windowHeight = 768;
|
|
|
+ windowWidth = 320;
|
|
|
+ windowHeight = 240;
|
|
|
|
|
|
for (param_i = 1 ; (param_i < argc) && (argv[param_i][0] == '-') ; param_i++)
|
|
|
{
|
|
@@ -426,7 +428,7 @@ int main(int argc, char *argv[])
|
|
|
{
|
|
|
default: exit(-1); /* Option not recognized */
|
|
|
case 'f': fullScreen = true; break;
|
|
|
- case 'w': windowWidth = atoi(argv[++param_i]);
|
|
|
+ case 'w': windowWidth = atoi(argv[++param_i]); break;
|
|
|
case 'h': windowHeight = atoi(argv[++param_i]); break;
|
|
|
#ifdef DYNA_LOG_LEVEL
|
|
|
case 'l': MAX_DEBUG_LEVEL = atoi(argv[++param_i]); break;
|