fps added to inputest.exe for efficiency testing of input wwww

diff --git a/makefile b/makefile
index 7bca89e30aea3be493cae3414acbc3a821b9fb69..46fa416870f8ac3eb37d43cae35acf9460905339 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -78,7 +78,7 @@ FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
-16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) timer.$(OBJ)
+16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)
 
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ)
 
@@ -312,8 +312,8 @@ wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
 mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c
        wcl $(FLAGS) -c $(SRCLIB)mapread.c
 
-timer.$(OBJ): $(SRCLIB)timer.h $(SRCLIB)timer.c
-       wcl $(FLAGS) -c $(SRCLIB)timer.c
+16_timer.$(OBJ): $(SRCLIB)16_timer.h $(SRCLIB)16_timer.c
+       wcl $(FLAGS) -c $(SRCLIB)16_timer.c
 
 16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
        wcl $(FLAGS) -c $(SRCLIB)16_in.c

diff --git a/src/16.c b/src/16.c
index c4367aa9380c1cee29763ce0a4fff3479dee35d5..5ee40aa99c7505274a26be3895d0735b6f0d0686 100755 (executable)
--- a/src/16.c
+++ b/src/16.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669\r
  *\r
  * This file is part of Project 16.\r
  *\r

diff --git a/src/16.h b/src/16.h
index 754184b15b6eb8aaf64dbc91738f54a63cbf95c5..aa8528dfde78f86c92c23c4520abd9cd5907dfb1 100755 (executable)
--- a/src/16.h
+++ b/src/16.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669\r
  *\r
  * This file is part of Project 16.\r
  *\r

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 0c0346f1f36af0a90660efc5aab98ac9b106e3d5..b752ef21785caa57799c7d124d38009f39b67713 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669\r
  *\r
  * This file is part of Project 16.\r
  *\r

diff --git a/src/inputest.c b/src/inputest.c
index 562f7f4e328268a9e0b9d500884ee8331f4a61d9..03f7a331f48d68f19bfb0103adcd71b90fa1f944 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & 0gwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -27,6 +27,7 @@
 void\r
 main(int argc, char *argv[])\r
 {\r
+       global_game_variables_t gvar;\r
        player_t player[MaxPlayers];\r
        //extern struct inconfig inpu;\r
        testkeyin=0;\r
@@ -38,11 +39,12 @@ main(int argc, char *argv[])
        player[0].d=2;\r
        player[0].persist_aniframe=0;\r
        player[0].speed=4;\r
-       //player[0].kd[0]=2;    player[0].kd[1]=2;\r
+       start_timer(&gvar);\r
        while(!IN_KeyDown(sc_Escape))\r
        {\r
-               #define INC_PER_FRAME if(player[0].q&1) player[0].persist_aniframe++; if(player[0].persist_aniframe>4) player[0].persist_aniframe = 1;\r
+               shinkutxt(&gvar);\r
                IN_ReadControl(0,&player);\r
+               #define INC_PER_FRAME if(player[0].q&1) player[0].persist_aniframe++; if(player[0].persist_aniframe>4) player[0].persist_aniframe = 1;\r
                switch(player[0].d)\r
                {\r
                //right movement\r
@@ -84,6 +86,19 @@ main(int argc, char *argv[])
                //printf("%u\n", IN_KeyDown(sc_Escape));\r
                //if(\r
                IN_qb(sc_9);//>0) printf("IN_qb(sc_9)=%u\n", IN_qb(sc_9));\r
+               if(IN_KeyDown(88))      //speed\r
+               {\r
+                       switch(gvar.kurokku.fpscap)\r
+                       {\r
+                               case 0:\r
+                                       gvar.kurokku.fpscap=1;\r
+                               break;\r
+                               case 1:\r
+                                       gvar.kurokku.fpscap=0;\r
+                               break;\r
+                       }\r
+                       //IN_Ack();\r
+               }\r
        }\r
        IN_Shutdown();\r
        //printf("%u\n", in.Keyboard[sc_Escape]);\r

diff --git a/src/lib/16_head.c b/src/lib/16_head.c
index 3b2d8a8ab53233e82738bbb8343747f0e361c856..d7de200ff7ee8d63bfee32bf29a8cc486bf9bf0b 100755 (executable)
--- a/src/lib/16_head.c
+++ b/src/lib/16_head.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669\r
  *\r
  * This file is part of Project 16.\r
  *\r

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index d48f48f1a3c316325e9237263ccf3179bc6b66ba..a3301f3ff7d99de9e588d2053bcd2ce97e64dae2 100755 (executable)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -172,6 +172,8 @@ typedef void __based(__self) * memptr;
 typedef void _seg * memptr;\r
 #endif\r
 \r
+#define INPUT_STATUS_1         0x03da\r
+\r
 /* local function */\r
 void wait(clock_t wait);\r
 \r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 05ea70c285a592c6b5858082cedb9389a3ddd93c..1337f5ed593bd1a036e36b83e9eb043c6b81080a 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -855,7 +855,7 @@ register    KeyboardDef     *def;
                                mx = motion_Left,my = motion_Down;\r
                        else if (Keyboard[def->downright])\r
                                mx = motion_Right,my = motion_Down;*/\r
-                       if(DIRECTIONIFELSEGFXTEST)\r
+                       if(DIRECTIONIFELSE)\r
                        {\r
                        if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){\r
                                if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]))\r

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 183dbb245855b6569ceb8c282abfd49c04d72719..bf0755e7a300c20f2dbd3ca0b43248c4677ec1b2 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -29,7 +29,7 @@
 \r
 #include <string.h>\r
 #include "src/lib/16_head.h"\r
-#include "src/lib/timer.h"\r
+#include "src/lib/16_timer.h"\r
 #include "src/lib/bitmap.h"\r
 #include "src/lib/planar.h"\r
 \r
@@ -47,8 +47,8 @@ extern byte testkeyin,testcontrolnoisy;
 //if else for gfxtesting and direction\r
 //player[pn].d == 2 ||\r
 //player[pn].d != 2 ||\r
-#define DIRECTIONIFELSEGFXTEST (player[pn].info.dir == 2)\r
-#define NDIRECTIONIFELSEGFXTEST        (player[pn].info.dir != 2)\r
+#define DIRECTIONIFELSE        (player[pn].info.dir == 2)\r
+//#define NDIRECTIONIFELSE     (player[pn].info.dir != 2)\r
 \r
 #define        KeyInt  9       // The keyboard ISR number\r
 \r

diff --git a/src/lib/timer.c b/src/lib/16_timer.c
similarity index 65%
rename from src/lib/timer.c
rename to src/lib/16_timer.c
index b5edff98b892cfd496fe6b05d05fd1a06bada9d4..c8416c79f822c08735e52cd15ade0026e4b7677e 100755 (executable)
--- a/src/lib/timer.c
+++ b/src/lib/16_timer.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -20,7 +20,7 @@
  *\r
  */\r
 \r
-#include "src/lib/timer.h"\r
+#include "src/lib/16_timer.h"\r
 \r
 clock_t start_timer(global_game_variables_t *gv)\r
 {\r
@@ -65,3 +65,40 @@ double time_in_seconds(global_game_variables_t *gv)
 {\r
        return (in_t) / CLOCKS_PER_SEC;\r
 }*/\r
+\r
+/*     sync    */\r
+void shinkutxt(global_game_variables_t *gv)\r
+{\r
+       //float t;\r
+       if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))\r
+       {\r
+               //t=(((*(gv->clock))-gv->clock_start) /18.2);\r
+               sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));\r
+               fprintf(stderr, "%s\n", gv->pee);\r
+               //(gv->clock_start)=*(gv->clock);\r
+               gv->kurokku.tiku=0;\r
+       }\r
+       gv->kurokku.tiku++;\r
+       switch(gv->kurokku.fpscap)\r
+       {\r
+               case 0:\r
+                       gv->kurokku.frames_per_second=1;\r
+               break;\r
+               case 1:\r
+                       //turn this off if XT\r
+                       WaitPee();\r
+                       gv->kurokku.frames_per_second=60;\r
+               break;\r
+       }\r
+}\r
+\r
+void WaitPee()\r
+{\r
+    while(inp(INPUT_STATUS_1)  & 8)  {\r
+       /* spin */\r
+    }\r
+\r
+    while(!(inp(INPUT_STATUS_1)  & 8))  {\r
+       /* spin */\r
+    }\r
+}\r

diff --git a/src/lib/timer.h b/src/lib/16_timer.h
similarity index 88%
rename from src/lib/timer.h
rename to src/lib/16_timer.h
index b4ca2e87c25fd7cb84431d724e4882e1339cb49f..ffe08a430edc079995e1c41159d1f9d93d7ab706 100755 (executable)
--- a/src/lib/timer.h
+++ b/src/lib/16_timer.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -30,5 +30,7 @@ double elapsed_timer(global_game_variables_t *gv);
 double ticktock(global_game_variables_t *gv);\r
 double time_in_seconds(global_game_variables_t *gv);\r
 //double time_in_seconds(time_t in_t);\r
+void shinkutxt(global_game_variables_t *gv);\r
+void WaitPee(void);\r
 \r
 #endif\r

diff --git a/src/lib/16text.c b/src/lib/16text.c
index 62b581e8c3d2ce70411dbe332baaa936a2ffb35f..95b307ef972ea4dd817de28b719cae089459360f 100755 (executable)
--- a/src/lib/16text.c
+++ b/src/lib/16text.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669\r
  *\r
  * This file is part of Project 16.\r
  *\r

diff --git a/src/lib/16text.h b/src/lib/16text.h
index c946ae5ea6631d7631d2a4572d64c99cc02c69b7..47325e029db6018c00aa65c4d410a3fd6d345b3f 100755 (executable)
--- a/src/lib/16text.h
+++ b/src/lib/16text.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669\r
  *\r
  * This file is part of Project 16.\r
  *\r

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 97b894f4ea734459a6829f7b35046eac4dea70b1..ee2f1a8608b459c89d5e7a329171debf5f27eb0b 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -1,11 +1,11 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669\r
  *\r
  * This file is part of Project 16.\r
  *\r
  * Project 16 is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 3 of the License, or\r
+ * the Free Software Foundation; either verson 3 of the License, or\r
  * (at your option) any later version.\r
  *\r
  * Project 16 is distributed in the hope that it will be useful,\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index c45aafbc8532ac489d9547b9e4872061b5d1422d..eae44931bc8045804df9929949ab5cd336c3bae6 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669
  *
  * This file is part of Project 16.
  *
@@ -145,7 +145,7 @@ extern byte far*  VGA;  /* The VGA Memory */
 #define HIGH_ADDRESS           0x0C
 #define LOW_ADDRESS            0x0D
 #define VRETRACE               0x08
-#define INPUT_STATUS_1         0x03da
+//#define INPUT_STATUS_1               0x03da  defined in 16_head
 #define DISPLAY_ENABLE         0x01
 #define MAP_MASK               0x02
 #define PAL_READ_REG                   0x03C7   /* Color register, read address */

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index ec8c7d41a136d0a89bc38383df72e56566ed0067..55122d14131cb46cd9b201be136542d3fd2d7ebf 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669
  *
  * This file is part of Project 16.
  *

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 939361575e602a69993e4c3fd77680076b702cba..dbfb7930b5ebf1e06940070349d242e4bf3bb058 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669
  *
  * This file is part of Project 16.
  *
@@ -30,7 +30,7 @@
 #include "src/lib/bitmap.h"
 #include "src/lib/planar.h"
 #include "src/lib/mapread.h"
-#include "src/lib/timer.h"
+#include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 
 //#define SPRITE

diff --git a/src/scroll.c b/src/scroll.c
index 162ce8e31098269c92269e020a6e25ed7777501c..e7987762f78ec3b587e2c3432cac78c45130493f 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -21,7 +21,7 @@
  */
 
 #include "src/lib/scroll16.h"
-#include "src/lib/timer.h"
+#include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 
 //#define FADE