diff --git a/src/0000Boot/0000Kernel.BIN.C b/src/0000Boot/0000Kernel.BIN.C index ee24f1fd..38ca4f89 100755 Binary files a/src/0000Boot/0000Kernel.BIN.C and b/src/0000Boot/0000Kernel.BIN.C differ diff --git a/src/Compiler/Compiler.BIN b/src/Compiler/Compiler.BIN index b34d605c..99f4653e 100755 Binary files a/src/Compiler/Compiler.BIN and b/src/Compiler/Compiler.BIN differ diff --git a/src/Demo/Games/BlackDiamond.CC b/src/Demo/Games/BlackDiamond.CC index da6300f0..07c47466 100755 Binary files a/src/Demo/Games/BlackDiamond.CC and b/src/Demo/Games/BlackDiamond.CC differ diff --git a/src/Demo/Games/Maze.CC b/src/Demo/Games/Maze.CC index fed4cae1..cdd465ed 100755 --- a/src/Demo/Games/Maze.CC +++ b/src/Demo/Games/Maze.CC @@ -5,7 +5,7 @@ U32 text[TEXT_ROWS][TEXT_COLS]; U0 DrawIt(CTask *task,CDC *) -{ //$LK,"gr.text_base",A="MN:CGrGlobals"$ gets clear 30fps, so we must use our own permanent text array. +{ //$LK,"gr.text_base",A="MN:CGrGlobals"$ gets clear 60fps, so we must use our own permanent text array. MemCopy(gr.text_base+TEXT_COLS,text,(TEXT_ROWS-1)*TEXT_COLS*sizeof(U32)); // You can copy it this way, if you like: diff --git a/src/Demo/Games/TheDead.CC b/src/Demo/Games/TheDead.CC index a52abc71..545b6e3d 100755 Binary files a/src/Demo/Games/TheDead.CC and b/src/Demo/Games/TheDead.CC differ diff --git a/src/Demo/Graphics/SpritePlot.CC b/src/Demo/Graphics/SpritePlot.CC index 3effab0e..09008c7e 100755 Binary files a/src/Demo/Graphics/SpritePlot.CC and b/src/Demo/Graphics/SpritePlot.CC differ diff --git a/src/Demo/Graphics/SunMoon.CC b/src/Demo/Graphics/SunMoon.CC index 82a501bc..ee3d1f9f 100755 --- a/src/Demo/Graphics/SunMoon.CC +++ b/src/Demo/Graphics/SunMoon.CC @@ -33,7 +33,7 @@ U0 SunMoon() gr.dc->dither_probability_u16=2*i; //U16 can be [0,65535] GrFloodFill(gr.dc,x-0.75*radius,y); - Refresh; //Typically 30 fps + Refresh; //Typically 60 fps DCFill; } diff --git a/src/Demo/MultiCore/MPAdd.CC b/src/Demo/MultiCore/MPAdd.CC index 8ac06e5b..3a3efb2a 100755 --- a/src/Demo/MultiCore/MPAdd.CC +++ b/src/Demo/MultiCore/MPAdd.CC @@ -83,3 +83,4 @@ U0 MPAdd() } MPAdd; + \ No newline at end of file diff --git a/src/Doc/GraphicsOverview.DD b/src/Doc/GraphicsOverview.DD index e8b8da2a..5915ea33 100755 Binary files a/src/Doc/GraphicsOverview.DD and b/src/Doc/GraphicsOverview.DD differ diff --git a/src/Doc/Strategy.DD b/src/Doc/Strategy.DD index 3c049a7e..828add9c 100755 --- a/src/Doc/Strategy.DD +++ b/src/Doc/Strategy.DD @@ -32,7 +32,7 @@ A three bttn mouse is like a leg you cannot put weight on. ZenithOS just does h * Least (greatest) common denominator hardware support. Mostly, one driver for each device class. I can't be in the business of different drivers. Compatibility is the greatest challenge for PC operating systems. Disk code does not use interrupts, avoiding compatibility risks. $FG,2$PS/2$FG$ keyboard/mouse is used instead of $FG,2$USB$FG$, also more compatible. -* $FG,2$640x480$FG$ 16 colors. Updates whole screen at $FG,2$30 fps$FG$, optimized for full screen games where $FG,2$InvalidRectangle$FG$s are counter-productive. +* $FG,2$640x480$FG$ 16 colors. Updates whole screen at $FG,2$60 fps$FG$, optimized for full screen games where $FG,2$InvalidRectangle$FG$s are counter-productive. * One font, 8x8. Text and graphic layers done in software with text normally on an 8x8 grid. It can run in Text mode if graphic initialization fails. diff --git a/src/Doc/TextBase.DD b/src/Doc/TextBase.DD index 8bb5481a..e3989987 100755 --- a/src/Doc/TextBase.DD +++ b/src/Doc/TextBase.DD @@ -1,4 +1,4 @@ -$WW,1$$LK,"gr.text_base",A="MN:CGrGlobals"$ must be updated 30fps in your Fs->draw_it() callback. You probably want $LK,"GrPrint",A="MN:GrPrint"$() or just $LK,"Print",A="MN:Print"$(). The $LK,"DolDoc",A="FI:::/Doc/DolDocOverview.DD"$ code takes care of plotting text to $LK,"gr.text_base",A="MN:CGrGlobals"$. +$WW,1$$LK,"gr.text_base",A="MN:CGrGlobals"$ must be updated 60fps in your Fs->draw_it() callback. You probably want $LK,"GrPrint",A="MN:GrPrint"$() or just $LK,"Print",A="MN:Print"$(). The $LK,"DolDoc",A="FI:::/Doc/DolDocOverview.DD"$ code takes care of plotting text to $LK,"gr.text_base",A="MN:CGrGlobals"$. Bits 0-7 8-Bit ASCII Screen Code Bits 8-11 Foreground $LK,"color",A="MN:BLACK"$ diff --git a/src/Kernel.BIN.C b/src/Kernel.BIN.C index ce23048b..498427d7 100755 Binary files a/src/Kernel.BIN.C and b/src/Kernel.BIN.C differ diff --git a/src/Tmp/MyDistro.iso b/src/Tmp/MyDistro.iso index 9f22977c..fe14f834 100755 Binary files a/src/Tmp/MyDistro.iso and b/src/Tmp/MyDistro.iso differ diff --git a/src/Zenith/DolDoc/DocRecalcLib.CC b/src/Zenith/DolDoc/DocRecalcLib.CC index c8ecde76..3d8d9914 100755 --- a/src/Zenith/DolDoc/DocRecalcLib.CC +++ b/src/Zenith/DolDoc/DocRecalcLib.CC @@ -191,7 +191,7 @@ public I64 DocMax(I64 i=I64_MAX) #help_index "DolDoc/Task;StdOut/Task" U0 DocUpdateTaskDocs(CTask *task) -{//This is called from $LK,"GrUpdateTaskWin",A="MN:GrUpdateTaskWin"$() by the winmgr at 30fps. +{//This is called from $LK,"GrUpdateTaskWin",A="MN:GrUpdateTaskWin"$() by the winmgr at 60fps. CDoc *doc; CD3I64 saved_scroll; if (task->border_src==BDS_CUR_DRIVE && task->cur_dv) diff --git a/src/Zenith/Gr/GrTextBase.CC b/src/Zenith/Gr/GrTextBase.CC index 5dff23ec..f690dfc1 100755 --- a/src/Zenith/Gr/GrTextBase.CC +++ b/src/Zenith/Gr/GrTextBase.CC @@ -5,7 +5,7 @@ asm { //************************************ _TEXT_CHAR:: //Bool TextChar(CTask *task,Bool allow_border=FALSE,I64 x,I64 y,I64 d); -//Must be called 30fps in Fs->draw_it() callback. +//Must be called 60fps in Fs->draw_it() callback. PUSH RBP MOV RBP,RSP MOV RCX,U64 SF_ARG1[RBP] @@ -83,7 +83,7 @@ _TEXT_CHAR:: //************************************ _TEXT_LEN_STR:: //Bool TextLenStr(CTask *task,I64 x,I64 y,I64 len,I64 attr,U8 *s) -//Must be called 30fps in Fs->draw_it() callback. +//Must be called 60fps in Fs->draw_it() callback. PUSH RBP MOV RBP,RSP PUSH RSI @@ -159,7 +159,7 @@ _TEXT_LEN_STR:: //************************************ _TEXT_LEN_ATTR_STR:: //Bool TextLenAttrStr(CTask *task,I64 x,I64 y,I64 len,U32 *_attr) -//Must be called 30fps in Fs->draw_it() callback. +//Must be called 60fps in Fs->draw_it() callback. PUSH RBP MOV RBP,RSP PUSH RSI @@ -234,7 +234,7 @@ _TEXT_LEN_ATTR_STR:: RET1 40 //************************************ _TEXT_LEN_ATTR:://Bool TextLenAttr(CTask *task,I64 x,I64 y,I64 len,I64 attr) -//Must be called 30fps in Fs->draw_it() callback. +//Must be called 60fps in Fs->draw_it() callback. PUSH RBP MOV RBP,RSP PUSH RSI @@ -310,16 +310,16 @@ _TEXT_LEN_ATTR:://Bool TextLenAttr(CTask *task,I64 x,I64 y,I64 len,I64 attr) RET1 40 } public _extern _TEXT_CHAR Bool TextChar(CTask *task,Bool allow_border=FALSE, -I64 x,I64 y,I64 d); //Plot char. 30fps in Fs->draw_it() callback. +I64 x,I64 y,I64 d); //Plot char. 60fps in Fs->draw_it() callback. public _extern _TEXT_LEN_STR Bool TextLenStr(CTask *task,I64 x,I64 y,I64 len, -I64 attr,U8 *s); //Plot str with len. 30fps in Fs->draw_it() callback. +I64 attr,U8 *s); //Plot str with len. 60fps in Fs->draw_it() callback. public _extern _TEXT_LEN_ATTR_STR Bool TextLenAttrStr(CTask *task,I64 x,I64 y, -I64 len,U32 *_attr); //Plot attr str with len. 30fps in Fs->draw_it() callback. +I64 len,U32 *_attr); //Plot attr str with len. 60fps in Fs->draw_it() callback. public _extern _TEXT_LEN_ATTR Bool TextLenAttr(CTask *task,I64 x,I64 y,I64 len, -I64 attr); //Plot attrs with len. 30fps in Fs->draw_it() callback. +I64 attr); //Plot attrs with len. 60fps in Fs->draw_it() callback. public U0 TextPrint(CTask *task,I64 x,I64 y,I64 attr,U8 *format,...) -{//Plot chars. 30fps in Fs->draw_it() callback. +{//Plot chars. 60fps in Fs->draw_it() callback. //You probably want $LK,"GrPrint",A="MN:GrPrint"$() or just $LK,"Print",A="MN:Print"$(). U8 *buf=StrPrintJoin(NULL,format,argc,argv); TextLenStr(task,x,y,StrLen(buf),attr<<8,buf); @@ -328,7 +328,7 @@ public U0 TextPrint(CTask *task,I64 x,I64 y,I64 attr,U8 *format,...) public U0 TextBorder(CTask *task=NULL, I64 l,I64 r,I64 t,I64 b,I64 attr,Bool solid) -{//Plot border square. 30fps in Fs->draw_it() callback. +{//Plot border square. 60fps in Fs->draw_it() callback. //Draws window borders or DolDoc text bttn borders. //Set task=sys_winmgr_task for no clipping. I64 i; @@ -349,7 +349,7 @@ public U0 TextBorder(CTask *task=NULL, } public U0 TextRect(I64 l,I64 r,I64 t,I64 b,I64 d) -{//Fill text rect. 30fps in Fs->draw_it() callback. +{//Fill text rect. 60fps in Fs->draw_it() callback. I64 y,w; if (l>r || t>b) return; if (t<0) t=0; diff --git a/src/Zenith/WinMgr.CC b/src/Zenith/WinMgr.CC index 3aa3f483..6293cbb4 100755 --- a/src/Zenith/WinMgr.CC +++ b/src/Zenith/WinMgr.CC @@ -1,7 +1,7 @@ #help_index "Windows;Task/Delay" public U0 Refresh(I64 count=1,Bool force=FALSE) -{//Wait for 30fps WinMgr to start & finish screen refresh. +{//Wait for 60fps WinMgr to start & finish screen refresh. //0,FALSE Count Sync to WinMgr. //0,TRUE Pump Messages. //1 Count Wait and Pump Messages.