From 2a548ae0dc6e758f67a81ae8c93607ea8d08934b Mon Sep 17 00:00:00 2001 From: TempleOS-bot Date: Mon, 30 Jan 2017 17:27:26 -0500 Subject: [PATCH] Nightly update (ISO SHA-1 e06524b) --- TempleOSCD/0000Boot/0000Kernel.BIN.C | Bin 192080 -> 192080 bytes TempleOSCD/Adam/ADefine.HC | 2 +- TempleOSCD/Compiler/Compiler.BIN | Bin 192920 -> 192920 bytes TempleOSCD/Compiler/CompilerB.HH | 1 - TempleOSCD/Demo/AcctExample/PersonalNotes.DD | 4 +- TempleOSCD/Demo/AcctExample/Registry.HC | 8 ++-- TempleOSCD/Demo/Graphics/LightTable.HC | 42 +++++++++++++++---- TempleOSCD/Doc/ChgLog.DD | 2 +- TempleOSCD/Kernel/KernelC.HH | 1 - TempleOSCD/Misc/OSTestSuite.HC | 25 ++++++++++- 10 files changed, 66 insertions(+), 19 deletions(-) diff --git a/TempleOSCD/0000Boot/0000Kernel.BIN.C b/TempleOSCD/0000Boot/0000Kernel.BIN.C index 23921d9642b5cd1549c72b5d6f0317d74720cabc..4c97e5733181bad684f57a9058b83573e1633307 100644 GIT binary patch delta 316 zcmca`hx@`E?g=LBvzNSjdD)hG^Fo%3%$s>w4n;D)*?c}$jg@Kco6X;oa%CAOZcc4j z&&>SFm2tA6rQ~LV7HKAy_2*m}rz;dNicd~!yTr&a*|L2WOW#XZ#>w%Wij#k|8#7<) z3z)3e;mcz33ZhVA^7%Hw%_};R8DUaPmtSv=?V2ga_-6C>6&sA0R=(W4^7dmMrqY7V zeJ^HlGCrTI`N^H}`Q*Y+>lt57R{U(w_-b?F=l!ybFSjcSGIkp>t(>@hofG3cex~P7 zr~3sl)`0}h1u^o8gBbTR8J`L>U3;_rXf5M*5oVZkw@;hI_?n$Dcze?<#!e%qn@_j% zo@K0KXA<2!dE+nP?F+6jZdGG^zCG+W<8^k%&D-^unXJQ^ir#F`j$#sXWK!C^y?Hj% G*&qOUJci-` delta 316 zcmca`hx@`E?g=LBA&YeGT(;%jypZK0^JX5FLy?ScH=mDHV`b`oyZL)kt}NrE&8ZFR znVDa^GEO$Ml-z94BF)4y^SmqLbcF&&@yTgzml*XXTei<)sd?qfI61ykaq^FLV`jFe zev|b&d|8xULljC(KHny|c|}JuBTS0v;G4~{T{Gnv-){cCVuKOWj8~gi-hRx(#K5q* z@5L-m#ut+{Ke;o$m|Xa2J>%=iil6NnUvEzQykC~_)pkWe#%@EV^hw*-IWf-TXS(ui zx?d1u9Z29@5F?*Bh;c8I@u@J=v$xxi)-rAvVTL((`?N`nuh|(Hwl~dU>@;FJ_G~-v zS;jhcrhl6!Z~P^^eZdvRt!j)fwuk*@yw1+JWxF0TlXW;#!rSfHQA}cvOgvk*H_v7| G8w3Dn^@Cmj diff --git a/TempleOSCD/Adam/ADefine.HC b/TempleOSCD/Adam/ADefine.HC index e9e5368..4627976 100644 --- a/TempleOSCD/Adam/ADefine.HC +++ b/TempleOSCD/Adam/ADefine.HC @@ -18,7 +18,7 @@ U0 LoadDocDefines() //$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/Adam/Opt/Boot/BootDVD.HC,DD_BOOT_HIGH_LOC_DVD"$ $TR-C,"LineRep"$ -$ID,4$DefinePrint("DD_TEMPLEOS_LOC","120,185"); +$ID,4$DefinePrint("DD_TEMPLEOS_LOC","120,236"); DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","82,012"); $ID,-4$ DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR); diff --git a/TempleOSCD/Compiler/Compiler.BIN b/TempleOSCD/Compiler/Compiler.BIN index 4ec766b2f65fac7910ef187228e6d8deb733a8e1..9bd1a08a4d779afe7fa4c82954c7f5fad7b37c26 100644 GIT binary patch delta 178 zcmbR7n0v-!?hS>Cj4Ydr6c45`KHF^4p%TNi_rm6=Cs)lGgSQ*VFqRmwUViDy$S}EZ zj_~$9K8y*BOcUR1m-Az+XJKMs*gijqQAm_=^Y%^YjQ3+%Ji8BgOb?J@65GD|D5Jb6 zqv7_`w-~2!Gd|m%^o((mHs|J0kM1`f&2J*6UStxPUht2RWxJ>l({wRL!|iJ|m`r#W l874RMicA*R!m<6I3DatE#^>8t`7pf^WHj79J&uWSG630QLYV*n delta 192 zcmbR7n0v-!?hS>Cj0~HL6c45`KHqH8p%TNi{Nm=QCs)lG8MYh9FqRmw9(?7>$S}EZ zj_~$9K8y*BO!aTK%lR?ZvoMvu-9A5vQAm_=%l1v_jQ3+%TpJh}rU%F{iEUqflu=%k zkzxDkTa44V8J}-Ydd4_On{!^MNB0|#<~I>jFEWWtFZjpEvRzb&X}Z|-7G5T?>3e@O za&AAZ!6e4R%E-Xa&Nyj{#P)wCOsmBiUu<9H!}LaQvW_{&^xS49?(Hk%nBGqU0Ax@{ ALI3~& diff --git a/TempleOSCD/Compiler/CompilerB.HH b/TempleOSCD/Compiler/CompilerB.HH index 989e1f4..76544c0 100644 --- a/TempleOSCD/Compiler/CompilerB.HH +++ b/TempleOSCD/Compiler/CompilerB.HH @@ -65,7 +65,6 @@ public extern I64 PrsKeyWord(CCmpCtrl *cc); #help_index "Compiler;Cmd Line (Typically)" extern I64 Cmp(U8 *filename, U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0); - #help_index "Debugging/Unassemble" public extern U8 *U(U8 *rip,I64 cnt=20,I64 seg_size=64); public extern U0 Ui(U8 *buf,U8 **_rip,I64 seg_size=64, diff --git a/TempleOSCD/Demo/AcctExample/PersonalNotes.DD b/TempleOSCD/Demo/AcctExample/PersonalNotes.DD index a9d6816..b5265ed 100644 --- a/TempleOSCD/Demo/AcctExample/PersonalNotes.DD +++ b/TempleOSCD/Demo/AcctExample/PersonalNotes.DD @@ -1,7 +1,5 @@ $WW,1$$FG,5$$TX+CX,"TODO"$$FG$ -* TestSuite $LK,"DoLightTable",A="FF:::/Misc/OSTestSuite.HC,DoLightTable"$ - * $LK,"::/Apps/X-Caliber/X-Caliber.HC"$ * Add asteroid harbor defense. * Afterburner thruster. @@ -441,7 +439,7 @@ $FG,5$$TX+CX,"Misc Notes"$$FG$ Erik van der Karbargenbok: $LK,"TempleBot",A="PI:~/Sup1/Sup1Bin/TempleBot"$. Intel CEO's name: Brian Krzanich >$FG,2$lspci -v$FG$ -Size:$TX,"17384KB",D="DD_TEMPLEOSCD_K_SIZE"$ +Size:$TX,"17386KB",D="DD_TEMPLEOSCD_K_SIZE"$ $FG,5$$TX+CX,"My Web Bookmarks"$$FG$$WW,0$ $TX,"My FireFox Bookmarks",HTML="http://www.templeos.org/Wb/Home/Sup1/Sup1Blog/Bookmarks"$ diff --git a/TempleOSCD/Demo/AcctExample/Registry.HC b/TempleOSCD/Demo/AcctExample/Registry.HC index fdf313e..1cd3afc 100644 --- a/TempleOSCD/Demo/AcctExample/Registry.HC +++ b/TempleOSCD/Demo/AcctExample/Registry.HC @@ -50,7 +50,7 @@ $ID,-2$$TR,"Wenceslas"$ $ID,2$F64 best_score=43.9944; $ID,-2$$TR,"OSTestSuite"$ $ID,2$progress1_tf=0.000;progress2_tf=0.000; -progress3_tf=0.000;progress4_tf=226.575; +progress3_tf=0.000;progress4_tf=227.004; $ID,-2$$TR,"XCaliber"$ $ID,2$I64 best_score=90; I64 msg_flags=2; @@ -62,13 +62,13 @@ $ID,-2$$TR,"Titanium"$ $ID,2$I64 best_score=16469; $ID,-2$$TR,"TOSRegen"$ $ID,2$progress1_tf=0.000;progress2_tf=0.000; -progress3_tf=0.000;progress4_tf=198.424; +progress3_tf=0.000;progress4_tf=203.549; $ID,-2$$ID,-2$$TR,"Once"$ $ID,2$$TR,"Adam"$ $ID,2$$ID,-2$$TR,"User"$ $ID,2$$ID,-2$$ID,-2$$TR,"DemoCompany"$ $ID,2$$TR,"Game1"$ -$ID,2$F64 best_score=2103.55708; +$ID,2$F64 best_score=188.69015; $TR,"SimpleVal"$ -$ID,2$1235; +$ID,2$1236; $ID,-2$$ID,-2$$ID,-2$ \ No newline at end of file diff --git a/TempleOSCD/Demo/Graphics/LightTable.HC b/TempleOSCD/Demo/Graphics/LightTable.HC index 088f2fc..2fba7b1 100644 --- a/TempleOSCD/Demo/Graphics/LightTable.HC +++ b/TempleOSCD/Demo/Graphics/LightTable.HC @@ -5,6 +5,7 @@ class Photon } p_root; CDC *map; +F64 ts; #define TAIL 20 U0 DrawIt(CTask *,CDC *dc) @@ -20,6 +21,20 @@ U0 DrawIt(CTask *,CDC *dc) } } +U0 RandomBurst() +{ + I64 i; + F64 é; + Photon *tmpp; + for (i=0;i<1000;i++) { + tmpp=CAlloc(sizeof(Photon)); + D3Equ(&tmpp->p,Fs->pix_width*Rand,Fs->pix_height*Rand); + é=2*ã*Rand; + D3Equ(&tmpp->v,Cos(é),Sin(é)); + QueIns(tmpp,p_root.last); + } +} + #define HEIGHT 10 U0 FindNormal(CDC *dc,Photon *tmpp,I64 last,I64,CD3 *_normal) { @@ -86,15 +101,13 @@ U0 SnellsLaw(CDC *dc,Photon *tmpp,I64 last,I64 next) U0 AnimateTask(I64) { - CD3 v; Photon *tmpp; I64 last,next; while (TRUE) { tmpp=p_root.next; while (tmpp!=&p_root) { last=GrPeek(map,tmpp->p.x,tmpp->p.y); - D3Mul(&v,1.5,&tmpp->v); - D3AddEqu(&tmpp->p,&v); + D3AddEqu(&tmpp->p,&tmpp->v); if (tmpp->p.x<=0) tmpp->v.x=-tmpp->v.x; if (tmpp->p.x>=map->width) tmpp->v.x=-tmpp->v.x; if (tmpp->p.y<=0) tmpp->v.y=-tmpp->v.y; @@ -106,12 +119,13 @@ U0 AnimateTask(I64) SnellsLaw(map,tmpp,last,next); tmpp=tmpp->next; } - Sleep(10); + Sleep(1000*ts); } } U0 Init() { + ts=0.01; map=DCNew(Fs->pix_width,Fs->pix_height); QueInit(&p_root); } @@ -138,11 +152,15 @@ U0 LightTable() "Edit {" " Fill(,CH_SPACE);" "}" + "Play {" + " RandomBurst(,'b');" + " ElapseTime(,'e');" + "}" ); PopUpOk( - "Draw splines with $$GREEN$${Left-Click}$$FG$$.\n\n" + "Draw splines with $$GREEN$${Left-click}$$FG$$.\n\n" "Fill lens with $$GREEN$$$$FG$$.\n\n" - "$$GREEN$${Right-Drag}$$FG$$ to fire rays.\n" + "$$GREEN$${Right-drag}$$FG$$ to fire rays.\n" ); SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$ Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS- @@ -189,7 +207,9 @@ lt_restart: i++; } } while (ipen_width=2; + Gr2BSpline3(map,c,i); + map->pen_width=1; break; case MSG_KEY_DOWN: switch (arg1) { @@ -201,6 +221,14 @@ lt_restart: CleanUp; Init; break; + case 'r': + RandomBurst; + break; + case 'e': + ts=0.00; + Sleep(2500); + ts=0.01; + break; case CH_ESC: case CH_SHIFT_ESC: goto lt_done; diff --git a/TempleOSCD/Doc/ChgLog.DD b/TempleOSCD/Doc/ChgLog.DD index 485bd28..d23e962 100644 --- a/TempleOSCD/Doc/ChgLog.DD +++ b/TempleOSCD/Doc/ChgLog.DD @@ -2,7 +2,7 @@ $WW,1$$FG,5$$TX+CX,"Change Log"$$FG$ Use $LK,"R",A="MN:R"$() to rename if I change a label. -$IV,1$----01/30/17 12:37:29----$IV,0$ +$IV,1$----01/30/17 13:54:47----$IV,0$ * Added $LK,"::/Demo/Graphics/LightTable.HC"$. $IV,1$----01/27/17 08:13:37----$IV,0$ diff --git a/TempleOSCD/Kernel/KernelC.HH b/TempleOSCD/Kernel/KernelC.HH index c880176..0dd595c 100644 --- a/TempleOSCD/Kernel/KernelC.HH +++ b/TempleOSCD/Kernel/KernelC.HH @@ -725,7 +725,6 @@ public extern CTask *Spawn(U0 (*fp_addr)(U8 *data),U8 *data=NULL, #help_index "Time/CPU Cycles;Time/HPET;Time/Jiffies" public extern CCntsGlbls cnts; - #help_index "Time/Date/CDate;Date/CDate" #help_file "::/Doc/TimeDate" extern U0 Date2ISO1(CISO1Date *dst,CDate cdt); diff --git a/TempleOSCD/Misc/OSTestSuite.HC b/TempleOSCD/Misc/OSTestSuite.HC index 4d446d9..bd5f15c 100644 --- a/TempleOSCD/Misc/OSTestSuite.HC +++ b/TempleOSCD/Misc/OSTestSuite.HC @@ -661,7 +661,30 @@ U0 DoLightTable() BirthWait(&task->popup_task); TaskWait(task->popup_task); PostMsgWait(task->popup_task,MSG_KEY_DOWN_UP,CH_SPACE,0); - Sleep(750); + + PostMsgWait(task,MSG_MS_L_DOWN_UP,100 ,200); + PostMsgWait(task,MSG_MS_L_DOWN_UP,100 ,200); + PostMsgWait(task,MSG_MS_L_DOWN_UP,100 ,200); + PostMsgWait(task,MSG_MS_L_DOWN_UP,120 ,180); + PostMsgWait(task,MSG_MS_L_DOWN_UP,160 ,120); + PostMsgWait(task,MSG_MS_L_DOWN_UP,320 ,10); + PostMsgWait(task,MSG_MS_L_DOWN_UP,640-160 ,120); + PostMsgWait(task,MSG_MS_L_DOWN_UP,640-120 ,180); + PostMsgWait(task,MSG_MS_L_DOWN_UP,640-100 ,200); + PostMsgWait(task,MSG_MS_L_DOWN_UP,640-100 ,200); + PostMsgWait(task,MSG_MS_L_DOWN_UP,640-100 ,200); + PostMsgWait(task,MSG_MS_L_DOWN_UP,100 ,200); + PostMsgWait(task,MSG_MS_L_DOWN_UP,100 ,200); + PostMsgWait(task,MSG_MS_L_DOWN_UP,100 ,200); + PostMsgWait(task,MSG_MS_R_DOWN_UP,0,0); + + MsSet(320,190); + PostMsgWait(task,MSG_KEY_DOWN_UP,CH_SPACE,0); + + PostMsgWait(task,MSG_MS_R_DOWN,290,240); + PostMsgWait(task,MSG_MS_R_UP ,320,220); + + Sleep(1500); PostMsgWait(task,MSG_KEY_DOWN_UP,CH_ESC,0); DeathWait(&task,TRUE); }