From b97fa7c00ece6f61c28406800e25a53d0d771592 Mon Sep 17 00:00:00 2001 From: TempleOS-bot Date: Tue, 31 Jan 2017 14:27:26 -0500 Subject: [PATCH] Nightly update (ISO SHA-1 e016a09) --- TempleOSCD/0000Boot/0000Kernel.BIN.C | Bin 192080 -> 192080 bytes TempleOSCD/Adam/ADefine.HC | 4 ++-- TempleOSCD/Compiler/Compiler.BIN | Bin 192920 -> 192920 bytes TempleOSCD/Compiler/CompilerB.HH | 1 - TempleOSCD/Demo/AcctExample/Registry.HC | 2 +- TempleOSCD/Demo/Graphics/LightTable.HC | 20 ++++++++++++++++++-- TempleOSCD/Doc/ChgLog.DD | 2 +- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/TempleOSCD/0000Boot/0000Kernel.BIN.C b/TempleOSCD/0000Boot/0000Kernel.BIN.C index 5434fa4d41ea896d71dba9d302d3d65068ac3453..2dd256ada2ebff1ac716c90b2a64ccc68d24e642 100644 GIT binary patch delta 197 zcmca`hx@`E?g=LBj(g>gT(RZeypZK0^JX5FmvM}|o4+N6DznJ($udq?C}0%doYt1h z$nsZ1mT_`?r{d%v?aeHUH6d~mlh3yaZeG!`nUT?Hb4-_aAfx2w6}O-8Fx{8m-1kB* zicxp_S|`T&{EWfVeS;Y58Fjax4PxXMXVl$(HwUdA!9ZvK`Os>~w7C(Afpp@30*b6Q(2 zBgFZYJY1VMgigM`{_}{Tc1H^PFX@XJ?uF zNrrK9W30&b#a9@+^q6#Hx9c-ASt~J~-JY$=^v{Ix=Ju>8CUHl`)!Un9Go1?p0R9t5 AkpKVy diff --git a/TempleOSCD/Adam/ADefine.HC b/TempleOSCD/Adam/ADefine.HC index fe4c606..a861bb4 100644 --- a/TempleOSCD/Adam/ADefine.HC +++ b/TempleOSCD/Adam/ADefine.HC @@ -18,8 +18,8 @@ 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,548"); -DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","82,014"); +$ID,4$DefinePrint("DD_TEMPLEOS_LOC","120,563"); +DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","82,013"); $ID,-4$ DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR); DefinePrint("DD_MP_VECT_END","%08X", diff --git a/TempleOSCD/Compiler/Compiler.BIN b/TempleOSCD/Compiler/Compiler.BIN index 4d57ae65e149cfbdaacdc892e81ce2aabdde12a9..760d595c8c7aaef11965a6508e67308ec2def524 100644 GIT binary patch delta 82 zcmbR7n0v-!?hO%77_~M>K3UAjsJHp=)8%Qb&YH4}43i7z2yfrx!e_j6i?dUU_>Xnqqh^&*qV^n!nkEZaqen40ec0D}e~R{#J2 diff --git a/TempleOSCD/Compiler/CompilerB.HH b/TempleOSCD/Compiler/CompilerB.HH index 989e1f4..e581d65 100644 --- a/TempleOSCD/Compiler/CompilerB.HH +++ b/TempleOSCD/Compiler/CompilerB.HH @@ -61,7 +61,6 @@ 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); diff --git a/TempleOSCD/Demo/AcctExample/Registry.HC b/TempleOSCD/Demo/AcctExample/Registry.HC index 1ba248c..40992dd 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=202.157; +progress3_tf=0.000;progress4_tf=204.328; $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 bea650c..05a8b21 100644 --- a/TempleOSCD/Demo/Graphics/LightTable.HC +++ b/TempleOSCD/Demo/Graphics/LightTable.HC @@ -155,7 +155,7 @@ U0 FindNormal(Photon *tmpp) D3Div(&tmpp->p,&p,bmp_scale); //Draw an arc one direction, finding point of contact. - for (step=1.0;step>=0.01;step/=4) + for (step=1.0;step>=0.01;step/=4) { for (è=0;è<=ã/4;è+=step*ã/bmp_norm_radius) { x=p.x+bmp_norm_radius*Cos(é+ã-ã/4-è); y=p.y+bmp_norm_radius*Sin(é+ã-ã/4-è); @@ -168,6 +168,14 @@ U0 FindNormal(Photon *tmpp) if (c!=BLACK) goto fn_p1; } + for (;è<=3*ã/4;è+=step*ã/bmp_norm_radius) { + x=p.x+bmp_norm_radius*Cos(é+ã-ã/4-è); + y=p.y+bmp_norm_radius*Sin(é+ã-ã/4-è); + c=BmpPeek(x,y); + if (c!=BLACK) + goto fn_p1; + } + } fn_p1: if (c==WHITE) D3Equ(&p1,x,y); @@ -175,7 +183,7 @@ fn_p1: D3Copy(&p1,&tmpp->p); //Draw an arc other direction, finding point of contact. - for (step=1.0;step>=0.01;step/=4) + for (step=1.0;step>=0.01;step/=4) { for (è=0;è<=ã/4;è+=step*ã/bmp_norm_radius) { x=p.x+bmp_norm_radius*Cos(é+ã+ã/4+è); y=p.y+bmp_norm_radius*Sin(é+ã+ã/4+è); @@ -188,6 +196,14 @@ fn_p1: if (c!=BLACK) goto fn_p2; } + for (;è<=3*ã/4;è+=step*ã/bmp_norm_radius) { + x=p.x+bmp_norm_radius*Cos(é+ã+ã/4+è); + y=p.y+bmp_norm_radius*Sin(é+ã+ã/4+è); + c=BmpPeek(x,y); + if (c!=BLACK) + goto fn_p2; + } + } fn_p2: if (c==WHITE) D3Equ(&p2,x,y); diff --git a/TempleOSCD/Doc/ChgLog.DD b/TempleOSCD/Doc/ChgLog.DD index 9f0a57e..7180c6e 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/31/17 09:52:56----$IV,0$ +$IV,1$----01/31/17 10:22:10----$IV,0$ * Added $LK,"::/Demo/Graphics/LightTable.HC"$. * Added $LK,"TOS Linux Setup",A="FF:::/Demo/AcctExample/TOS/TOSPolicies.DD,TOS Linux Setup"$.