chrisws
diff --git a/‎samples/node/1396.bas
Lines changed: 33 additions & 46 deletions b/‎samples/node/1396.bas
Lines changed: 33 additions & 46 deletions
diff --git a/`‎samples/node/1531.bas` b/`‎samples/node/1531.bas`
@@ -1,48 +1,36 @@
+'Persian Carpet v2.bas for SmallBASIC 0.12.9 (B+=MGA)
+'modified from copy from Retrogamecoding link 2016-02-09
+' 2017-09-23 mod for brighter colors and centered
+' alas, some blank screens but much brighter!
 
-'Persian Carpet.bas for SmallBASIC 0.12.2 [B+=MGA] 2016-02-08
-'modified from copy from Retrogamecoding link 2016-02-08
-'modified some more for Code Library and On-line Samples
-REM BASIC Code: Persian Carpet Designs 
+' 2017-09-24 eliminate radial symmetry and most blank screens
+
+REM BASIC Code: Persian Carpet Designs
 REM A modification of original concept from Anne Burns
-REM Try colorborder=15, a=3
-colorborder=0:a=1
+
+colorborder = 0 : a = 1
+xo = (xmax - 512) / 2 : yo = (ymax - 512) / 2
 while 1
-  'cls
-  'INPUT "Enter the border color, 1 - 15 (try 15): ", colorborder
-  'INPUT "Enter a value (try 3) > ", a
   CLS
-  lft = 1
-  'rght=1025 'not symmetric
-  rght = 513
-  'rght=401
-  'rght=257
-  'rght=129
-  'rght=65
-  top = 1
-  'bot= 1025 'not symmetric
-  bot=513
-  'bot = 401
-  'bot= 257
-  'bot=129
-  'bot=65
-  LINE lft,top,rght,top,colorborder
-  LINE lft,bot,rght,bot,colorborder
-  LINE lft,top,lft,bot,colorborder
-  LINE rght,top,rght,bot,colorborder
+  lft = 1 + xo : rght = 513 + xo : top = 1 + yo: bot = 513 + yo
+  cb2 = rnd * 16 \ 1
+  LINE lft, top, rght, top, cb2
+  LINE lft, bot, rght, bot, cb2
+  LINE lft, top, lft, bot, colorborder
+  LINE rght, top, rght, bot, colorborder
   DetermineColor lft, rght, top, bot, a
-  'next line no good for on-line samples
-  'at 50,600:? "colorboarder = ";colorborder;" a = ";a
+  at 10, 10 : ? "colorboarder = ";colorborder;"  cb 2 = ";cb2;"  a = ";a
   showpage
-  delay 1000
-  a=a+1
-  if a>=16 then a=1:colorborder+=1
-  if colorborder>=16 then colorborder=0
-wEND
+  pause
+  a = a + 1
+  if a >= 16 then a = 1 : colorborder += 1
+  if colorborder >= 16 then colorborder = 0
+wend
 
-REM Determine the color based on function f
+rem Determine the color based on function f
 sub DetermineColor(lft, rght, top, bot, a)
-  local c,middlerow,middlecol
-  IF (lft < rght - 1) THEN
+  local c, middlerow, middlecol
+  IF (lft < rght - 2) THEN
     c = f(lft, rght, top, bot, a)
     middlecol = int((lft + rght) / 2)
     middlerow = int((top + bot) / 2)
@@ -54,14 +42,13 @@ sub DetermineColor(lft, rght, top, bot, a)
     DetermineColor middlecol, rght, middlerow, bot, a
   else
     exit
-  END IF
-END
+  end if
+end
 
-REM When b=4, this function takes an average.
-FUNC f(lft, rght, top, bot, a)
-  local p,b
-  p = POINT(lft, top) + POINT(rght, top) + POINT(lft, bot) + POINT(rght, bot)
+func f(lft, rght, top, bot, a)
+  local p, b
+  p = point(lft, top) + POINT(rght, top) + POINT(lft, bot) + POINT(rght, bot)
   'Try values of b = 4 or b = 7
-  b=7
-  f = (p /b + a) MOD 16
-END
+  b = 60
+  f = int(p / b + a) mod 9 + 7
+end
@@ -1,6 +1,7 @@
 
 ' Another look at Trig functions.bas  SmallBASIC 0.12.2 [B+=MGA] 2016-05-01
 ' inspired by PeterMaria's simple code for Atan2 on Aurels' forum BasicPro
+' 2017-09-23 Modified to run again on Android
 
 ' Here is another effort in a continuing series to demystify Trig functions:
 
@@ -10,56 +11,42 @@
 ' angles to the horizontal line, lengths of the sides and hypotenuse of the right
 ' and the COS, SIN and TAN ratios
 
-sub drawXit
-  local c, i
-  'for mouse clicks 
-  'mx > mxborder=xmax-60
-  'my < myborder=30
-  c = rgb(190, 0, 0)
-  rect xmax - 60, 10 step 51, 21, 0 filled
-  rect xmax - 60, 10 step 50, 20, c filled
-  for i = 0 to 2
-    line xmax - 40 + i, 15, xmax - 33 + i, 25, 15
-    line xmax - 40 + i, 25, xmax - 33 + i, 15, 15
-  next i
-end
-
 sub ThickArc(xCenter, yCenter, arcRadius, dAngleStart, dAngleEnd, rThick)
-  local rAngle, rAngleStart, rAngleEnd, x1, y1, Stepper  
+  local rAngle, rAngleStart, rAngleEnd, x1, y1, Stepper
   'draws an Arc with center at xCenter, yCenter, radius from center is arcRadius
-  
+
   'for SmallBASIC angle 0 degrees is due East and angle increases clockwise towards South
-  
-  'THIS SUB IS SETUP TO DRAW AN ARC IN CLOCKWISE DIRECTION 
-  
+
+  'THIS SUB IS SETUP TO DRAW AN ARC IN CLOCKWISE DIRECTION
+
   'dAngleStart is where to start Angle in degrees
   ' so make the dAngleStart the first ray clockwise from 0 degrees that starts angle drawing clockwise
-  
+
   'dAngleEnd is where the arc ends going clockwise with positive degrees
   ' so if the arc end goes past 0 degrees clockwise from dAngleStart
   '  express the end angle as 360 + angle
-  
+
   'rThick is the radius of the many,many tiny circles this will draw to make the arc thick
   ' so if rThick = 2 the circles will have a radius of 2 pixels and arc will be 4 pixels thick
   if arcRadius < 1 then pset xCenter, yCenter : exit func
   rAngleStart = rad(dAngleStart) : rAngleEnd = rad(dAngleEnd)
   if int(rthick) = 0 then Stepper = 1 / (arcRadius*pi) else Stepper = rThick / (arcRadius * pi / 2)
   for rAngle = rAngleStart to rAngleEnd step Stepper
     x1 = arcRadius * cos(rAngle) : y1 = arcRadius * sin(rAngle)
-    if int(rThick) < 1 then  
-      pset xCenter + x1, yCenter + y1 
-    else 
+    if int(rThick) < 1 then
+      pset xCenter + x1, yCenter + y1
+    else
       circle xCenter + x1, yCenter + y1, rThick filled
     fi
   next
 end
 
 sub ThickLine(x1, y1, x2, y2, rThick)
   local length, stepx, stepy, dx, dy, i
-   
+
   'x1,y1 is one endpoint of line
   'x2,y2 is the other endpoint of the line
-  'rThick is the radius of the tiny circles that will be drawn 
+  'rThick is the radius of the tiny circles that will be drawn
   '   from one end point to the other to create the thick line
   'Yes, the line will then extend beyond the endpoints with circular ends.
 
@@ -74,7 +61,7 @@ sub ThickLine(x1, y1, x2, y2, rThick)
   end if
 end
 
-'============================== Main 
+'============================== Main
 const thick = 2
 const arc_radius = 100
 const hor_color = rgb(30,30,30)
@@ -86,38 +73,32 @@ const white = rgb(255,255,255)
 cx = xmax / 2 : cy = ymax / 2
 
 while 1
-  if asc(inkey) = 27 then end else pen on  'did user press esc to quit?
   cls
-  'draw eXit sign
-  drawXit
-  
+
   'draw horizontal through center of screen
   line 0, cy, xmax, cy, hor_color
-  
+
   'get mouse
   mx = pen(4) : my = pen(5)   'get mouse location
-  
-  'check if eXit was clicked, if so then end
-  if mx > xmax - 60 and my < 30 and pen(3) then end
-  
-  'draw our Color Coded Trig Triangle  
+
+  'draw our Color Coded Trig Triangle
   color cos_color
   ThickLine cx, cy, mx, cy, thick
   color sin_color
   ThickLine mx, cy, mx, my, thick
   color hyp_color
   ThickLine cx, cy, mx, my, thick
-  
+
   stepx = abs(cx - mx) : stepy = abs(cy - my)
   hyp = ( (stepx ^ 2 + stepy ^ 2) ^.5 )\1
-  
+
   'to draw angle need to do some math
   'dAng = mouse angle to 0 degrees due East
   ' other Angles:  StartA, EndA and reportA are for the Trig Ratios of triangle
   dAng = ( deg(atan( (my - cy) / (mx - cx) ) )+.5 ) \ 1
   if mx < cx then dAng = dAng + 180
   if my < cy and mx > cx then dAng = dAng + 360
-  if dAng <= 90 then 
+  if dAng <= 90 then
     startA = 0 : endA = dAng : reportA = dAng
   elif dAng <= 180
     startA = dAng : endA = 180 : reportA = 90 - (dAng - 90)
@@ -128,7 +109,7 @@ while 1
   fi
   color ang_color
   ThickArc cx, cy, arc_radius, startA, endA, thick
-  
+
   'report all numbers color coded
   color ang_color
   locate 0, 0 : ? "yellow Angle (degrees) ~ "; reportA
@@ -167,5 +148,5 @@ while 1
   fi
   showpage
   delay 100
-  pen off
 wend
+