v1.15.0 - Added updates to the raster library.

halyde/apps/rtest3d.lua

@@ -1,3 +1,5 @@
+local component = import("component")
+local computer = import("computer")
 local raster = import("raster")
 local event = import("event")
 
@@ -74,7 +76,8 @@ end
 
 -- Render a single frame
 local function renderFrame()
-    increment = increment + 0.05
+    local time = computer.uptime()*20
+    increment = time*0.05 -- increment + 0.05
     CUBE_SIZE = (math.sin(increment) + 1) * 25
     vertices = {
       {-CUBE_SIZE, -CUBE_SIZE, -CUBE_SIZE}, -- 0: left bottom back
@@ -88,9 +91,9 @@ local function renderFrame()
     }
     -- Update rotation angles
     raster.clear()
-    angleX = angleX + ROTATION_SPEED
-    angleY = angleY + ROTATION_SPEED * 0.7
-    angleZ = angleZ + ROTATION_SPEED * 0.5
+    angleX = time * ROTATION_SPEED       -- angleX
+    angleY = time * ROTATION_SPEED * 0.7 -- angleY
+    angleZ = time * ROTATION_SPEED * 0.5 -- angleZ
     
     -- Project all vertices
     local projectedPoints = {}
@@ -124,6 +127,7 @@ function main()
     -- Main loop (assume this is called repeatedly by the host environment)
     while true do
       renderFrame()
+      coroutine.yield()
       if event.pull("key_down", 0) then
         raster.free()
         break

halyde/core/boot.lua

@@ -1,7 +1,7 @@
 local loadfile = ...
 local filesystem = loadfile("/halyde/lib/filesystem.lua")(loadfile)
 
-_G._OSVERSION = "Halyde 1.14.2"
+_G._OSVERSION = "Halyde 1.15.0"
 _G._OSLOGO = ""
 local handle, tmpdata = filesystem.open("/halyde/config/oslogo.ans", "r"), nil
 repeat

halyde/lib/raster.lua

@@ -5,7 +5,8 @@ local raster = {
   ["displayWidth"]=0,
   ["displayHeight"]=0,
   ["charWidth"]=0,
-  ["charHeight"]=0
+  ["charHeight"]=0,
+  ["backgroundColor"]=0xFFFFFF
 }
 
 local component = import("component")
@@ -34,22 +35,27 @@ function raster.init(width, height, bgcolor)
     width, height = gpu.getResolution()
   end
 
-  for i = 1, width*height do
-    chunksAffected[i] = true
-  end
   raster.charWidth = width
   raster.charHeight = height
 
   width, height = raster.units.charToBraille(width, height)
   
   bgcolor = bgcolor or raster.defaultBackgroundColor
+  if bgcolor~=0 then
+    for i=1,width*height do
+      display[i]=bgcolor
+    end
+  end
 
   raster.displayWidth = width
   raster.displayHeight = height
+  raster.backgroundColor = bgcolor
 
   pcall(function()
     renderBuffer = gpu.allocateBuffer()
   end)
+
+  raster.clear()
 end
 
 function raster.set(x, y, color)
@@ -70,7 +76,7 @@ end
 
 function raster.get(x, y)
   local i = x+y*raster.displayWidth
-  return display[i] or 0
+  return display[i] or raster.backgroundColor
 end
 
 local function stats(arr)
@@ -88,8 +94,14 @@ end
 
 local function getKeys(t)
   local keys = {}
-  for key, _ in pairs(t) do
-    table.insert(keys, key)
+  for k,v in pairs(t) do
+    table.insert(keys,{k,v})
+  end
+  table.sort(keys,function(a,b)
+    return a[2]>b[2]
+  end)
+  for i=1,#keys do
+    keys[i] = keys[i][1]
   end
   return keys
 end
@@ -127,6 +139,7 @@ local function arrayToBraille(arr)
   for i=1,8 do
     codePoint = codePoint | arr[i]<<(i-1)
   end
+  if codePoint==0x2800 then return " " end
   return utf8.char(codePoint)
 end
 
@@ -172,7 +185,10 @@ function raster.clear()
   if renderBuffer~=nil then
     gpu.setActiveBuffer(renderBuffer)
   end
-  clear()
+  -- clear()
+  local bgcolor = raster.backgroundColor
+  gpu.setBackground(bgcolor)
+  gpu.fill(1,1,raster.displayWidth,raster.displayHeight," ")
   display = {}
 end