From 49ec7c2650c22dad0517da4bdc14a25db5960867 Mon Sep 17 00:00:00 2001 From: TempleOS-bot Date: Mon, 30 Jan 2017 22:27:28 -0500 Subject: [PATCH] Nightly update (ISO SHA-1 2321383) --- 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 | 2 +- TempleOSCD/Demo/AcctExample/Registry.HC | 2 +- TempleOSCD/Demo/Graphics/LightTable.HC | 17 +++++++++-------- TempleOSCD/Doc/ChgLog.DD | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/TempleOSCD/0000Boot/0000Kernel.BIN.C b/TempleOSCD/0000Boot/0000Kernel.BIN.C index 8ed11ffab77376639f23599860e39ab3c00dfdbf..9e8947e9bbba3ada6c25ec2eedb0fdf10e0876b1 100644 GIT binary patch delta 245 zcmca`hx@`E?g=LBd!GACUa{rgypZK0^JX5FmvM}3o4+NkmYDo!n(*c=)zi6HCi2NL zPFE;k6rY^dc8O7MvSs@$mU2y5#>w%Wij#k|8#9Z1)R?T-;mabc1yLw5`Fxw;<`o^u zj4&z2-J4^&yaO30ZC-Kv2@g|d-sZj+a#4)E+t)fV&gW-5J>55mv7WJa``I8yesRX$ z?RPU7p9wSW-+rW)ajy(x{`RI>jIVi_85kL+7p!2c1v5UZV60#^~)?QB2~Fj2hdUW;2}&0s!mJTv`AC delta 248 zcmca`hx@`E?g=LB8`bnguGn&KUdVEhc{2~o%Q(i~&EJw%ORz=7$DKSRuz7j)5-yfm ze6ozw6$%)|C#SVtVq}YS|`T&{ESzo`vx)AGe&Jc8^p*j z&KR}*ZYJY1Va8+IkJK{mm0>K}-ZYExH7~P)lFIag6^ylD#)lP*bxcYs+Y44Q&Q@kT rww>oJV?8^I@@E;w$&Ilh+ZSJ9Jl4vXxIHV1N!*dqaC_5irgK36m}gqm diff --git a/TempleOSCD/Adam/ADefine.HC b/TempleOSCD/Adam/ADefine.HC index 41f9ff2..b75a14c 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,311"); +$ID,4$DefinePrint("DD_TEMPLEOS_LOC","120,312"); 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 e1f8ab4d805fb35df673dfb38c12e6f0b85cd43a..064b77e10558ddd550245efeaeef38475dad72d5 100644 GIT binary patch delta 171 zcmbR7n0v-!?hOTsOrCk0ixiVs*ciZI^DWiLBu3TECLJm5i)Z%%kLdw2Ok&$tA7zvmWh~l$ z`WB<6IcIUGNB0|#<~I>jFEWWtFZjpEvRzb&X}TC=(e||(OeQ>x43isrMJ5Yu;n@Dq YgeixIv0;0*Ba^l)W6}2MaZHSp0jqdAD*ylh delta 191 zcmbR7n0v-!?hOTsObiU0ixiVs*!r*C6YamY`Ic&A5~JE?lMa;_#+92RpDbaV&eXsp zyjkFxycuKBb^{s45(C!5nzD=xlMCkvZ{Op?n83)`uwB-Vv80^EwSkdgdVma**!I;& z8RbP88MdFk#i(h{=@shH{l=sDO~llTOd`_@{xPy_7ZqZfE;hY|mq~2;-rtOz+fQpS xiSe*9GVrrAPTC@|{htX_4$pKaJ0`vDGaQ-z$xPNU=a`<`%*4HYWgOG{NdPT+LCpXF diff --git a/TempleOSCD/Compiler/CompilerB.HH b/TempleOSCD/Compiler/CompilerB.HH index 76544c0..e581d65 100644 --- a/TempleOSCD/Compiler/CompilerB.HH +++ b/TempleOSCD/Compiler/CompilerB.HH @@ -61,10 +61,10 @@ public extern I64 MemberMetaData(U8 *st,CMemberLst *ml); public extern CMemberLstMeta *MemberMetaFind(U8 *st,CMemberLst *ml); public extern CHashClass *OptClassFwd(CHashClass *tmpc); 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/Registry.HC b/TempleOSCD/Demo/AcctExample/Registry.HC index 4cb8fb4..a2b3725 100644 --- a/TempleOSCD/Demo/AcctExample/Registry.HC +++ b/TempleOSCD/Demo/AcctExample/Registry.HC @@ -62,7 +62,7 @@ $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=201.797; +progress3_tf=0.000;progress4_tf=192.403; $ID,-2$$ID,-2$$TR,"Once"$ $ID,2$$TR,"Adam"$ $ID,2$$ID,-2$$TR,"User"$ diff --git a/TempleOSCD/Demo/Graphics/LightTable.HC b/TempleOSCD/Demo/Graphics/LightTable.HC index 41b91de..b623fc0 100644 --- a/TempleOSCD/Demo/Graphics/LightTable.HC +++ b/TempleOSCD/Demo/Graphics/LightTable.HC @@ -9,7 +9,7 @@ F64 ts; U8 *bmp; F64 bmp_scale; -I64 bmp_mem,bmp_width,bmp_height; +I64 bmp_mem,bmp_width,bmp_height,bmp_norm_radius; I64 BmpPeek(I64 x,I64 y) { @@ -81,7 +81,7 @@ U0 RandomBurst() I64 i; F64 é; Photon *tmpp; - for (i=0;i<1000;i++) { + for (i=0;i<256;i++) { tmpp=CAlloc(sizeof(Photon)); D3Equ(&tmpp->p,Fs->pix_width*Rand,Fs->pix_height*Rand); é=2*ã*Rand; @@ -90,7 +90,6 @@ U0 RandomBurst() } } -#define HEIGHT (5*bmp_scale) U0 FindNormal(Photon *tmpp,I64 last,I64,CD3 *_normal) { CD3 p1,p2,v,s,bmp_p; @@ -100,9 +99,9 @@ U0 FindNormal(Photon *tmpp,I64 last,I64,CD3 *_normal) while (BmpPeek(bmp_p.x,bmp_p.y)==last) D3AddEqu(&bmp_p,&tmpp->v); - for (è=0;è<ã/2;è+=ã/HEIGHT) { + for (è=0;è<ã/2;è+=ã/bmp_norm_radius) { D3Equ(&s,Cos(é+ã-ã/4-è),Sin(é+ã-ã/4-è)); - D3Mul(&v,HEIGHT,&s); + D3Mul(&v,bmp_norm_radius,&s); D3Add(&p1,&bmp_p,&v); if (BmpPeek(p1.x,p1.y)!=BLACK) break; @@ -110,9 +109,9 @@ U0 FindNormal(Photon *tmpp,I64 last,I64,CD3 *_normal) if (BmpPeek(p1.x,p1.y)!=WHITE) D3Copy(&p1,&tmpp->p); - for (è=0;è<ã/2;è+=ã/HEIGHT) { + for (è=0;è<ã/2;è+=ã/bmp_norm_radius) { D3Equ(&s,Cos(é+ã+ã/4+è),Sin(é+ã+ã/4+è)); - D3Mul(&v,HEIGHT,&s); + D3Mul(&v,bmp_norm_radius,&s); D3Add(&p2,&bmp_p,&v); if (BmpPeek(p2.x,p2.y)!=BLACK) break; @@ -196,6 +195,7 @@ U0 Init() bmp_width =bmp_scale*Fs->pix_width; bmp_height=bmp_scale*Fs->pix_height; bmp=CAlloc(bmp_width*bmp_height/8); + bmp_norm_radius=Min(10*bmp_scale,250); } U0 CleanUp() @@ -302,7 +302,8 @@ lt_restart: break; case 'e': ts=0.00; - Sleep(2500); + Sleep(1500); + FlushMsgs; ts=0.01; break; case CH_ESC: diff --git a/TempleOSCD/Doc/ChgLog.DD b/TempleOSCD/Doc/ChgLog.DD index fbe1396..71c896a 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 17:52:32----$IV,0$ +$IV,1$----01/30/17 18:21:26----$IV,0$ * Added $LK,"::/Demo/Graphics/LightTable.HC"$. $IV,1$----01/27/17 08:13:37----$IV,0$