diff options
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/src/main.cpp b/src/main.cpp index 1843f4a..e48a66a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,7 +22,6 @@ Entity *entnpc[32]; //The NPC base Player player; //The actual player object NPC npc[32]; Structures build; -UIClass ui; //Yep World *currentWorld;//u-huh World *spawn; @@ -35,7 +34,7 @@ unsigned int millis(void){ return std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count(); } -int main(int argc,char **argv){ +int main(/*int argc,char **argv*/){ //runs start-up procedures if(!SDL_Init(SDL_INIT_VIDEO)){ atexit(SDL_Quit); @@ -81,7 +80,7 @@ int main(int argc,char **argv){ **** GAMELOOP **** **************************/ - ui.init("ttf/VCR_OSD_MONO_1.001.ttf"); + ui::init("ttf/VCR_OSD_MONO_1.001.ttf"); irand(time(NULL)); entPlay = &player; @@ -120,6 +119,7 @@ int main(int argc,char **argv){ npc[i].loc.x += npc[i].vel.x * deltaTime; } } + render(); if(prevTime + MSEC_PER_TICK >= millis()){ //the logic loop to run at a dedicated time @@ -174,23 +174,24 @@ void render(){ glRectf(build.loc.x, build.loc.y, build.loc.x + build.width, build.loc.y + build.height); ///BWAHHHHHHHHHHHH - ui.setFontSize(16); + ui::setFontSize(16); if(++div==20){ div=0; d=deltaTime; fps=(1000/d); } - ui.putText(-.98 + player.loc.x, .94, "FPS: %1.0f\nDT: %1.0f",fps); + ui::putText(-.98 + player.loc.x, .94, "FPS: %1.0f\nDT: %1.0f",fps,d); //ui.putText(-.98 + player.loc.x, .88, "DT: %1.0f",d); - ui.putText(player.loc.x,player.loc.y-(HLINE*10),"(%+1.3f,%+1.3f)",player.loc.x,player.loc.y); + ui::putText(player.loc.x,player.loc.y-(HLINE*10),"(%+1.3f,%+1.3f)",player.loc.x,player.loc.y); /************************** **** CLOSE THE LOOP **** **************************/ //DRAW MOUSE HERE!!!!!W - mx=(ui.mousex/(float)SCREEN_WIDTH)*2.0f-1.0f; - my=((SCREEN_HEIGHT-ui.mousey)/(float)SCREEN_HEIGHT)*2.0f-1.0f; + glColor3ub(255,0,0); + mx=(ui::mousex/(float)SCREEN_WIDTH)*2.0f-1.0f; + my=((SCREEN_HEIGHT-ui::mousey)/(float)SCREEN_HEIGHT)*2.0f-1.0f; if(player.loc.x-1>-1)mx+=player.loc.x; glBegin(GL_TRIANGLES); @@ -208,7 +209,8 @@ void render(){ void logic(){ float gw; - ui.handleEvents(); // Handle events + + ui::handleEvents(); // Handle events if(player.right)player.vel.x=.00075; else if(player.left)player.vel.x=-.00075; @@ -232,13 +234,17 @@ void logic(){ player.loc.x=-1+HLINE; } } - + currentWorld->detect(&build.loc,&build.vel,build.width); - for(int i = 0; i < eAmt(entnpc); i++){ - if(npc[i].alive == true){ - currentWorld->detect(&npc[i].loc,&npc[i].vel,npc[i].width); - entnpc[i]->wander((grand()%181 + 1), &npc[i].vel); + /*for(int i = 0; i < 32; i++){ + if(entnpc[i]->alive){ + currentWorld->detect(&entnpc[i]->loc,&entnpc[i]->vel,entnpc[i]->width); + std::cout<<(void *)entnpc[i]<<" "<<i<<" "<<entnpc<<" "<<eAmt(entnpc)<<std::endl; + entnpc[i]->wander(30, &entnpc[i]->vel); } - } + }*/ + ////////////////////// + std::cout<<"shit"; + tickCount++; } |