shorten shader floats, adjust cam speed, fill window, -shtest

Author: parameterized

Main.ipynb

@@ -22,7 +22,7 @@ def gen(model):
     int channelGroup = int(screen_coords.x / screenSize.x);
     vec2 uv = mod(screen_coords, screenSize) / screenSize;
     uv -= 0.5;
-    uv.x = -uv.x;
+    uv.x = -uv.x * screenSize.x / screenSize.y;
     mat3 ca = setCamera(camPos, camTarget, 0.0);
     vec3 ro = camPos;
     vec3 rd = ca * normalize(vec3(uv, 1.0));
@@ -88,9 +88,9 @@ def gen(model):
                     weights = w[i * 4 + j]
                     s += f'\t\tfloat c{j} = ' \
                     + '+'.join([
-                        f'h{k // 4}[{k % 4}]*({v})'
+                        f'h{k // 4}[{k % 4}]*({v:.8f})'
                         for k, v in enumerate(weights)]) \
-                    + f'+({b[i * 4 + j]});\n'
+                    + f'+({b[i * 4 + j]:.8f});\n'
             if layer == model.layers[-1]:
                 s += """\t\treturn clamp(vec4(c0, c1, c2, c3), 0.0, 1.0);
     } else """

gen_shaders.py

@@ -5,16 +5,16 @@ function camera.load()
 	camera.pos = { x=-3.7, y=-1.6, z=-0.3 }
 	camera.rot = { x=0, y=0.2, z=0 }
     camera.target = nil -- set in update
-    camera.moveSpeed = 2
+    camera.moveSpeed = 20
     camera.turnSpeed = 1 / 200
 end
 
 function camera.update(dt)
     local speed = camera.moveSpeed
     if love.keyboard.isScancodeDown('lctrl') then
-        speed = speed / 6
+        speed = speed / 4
     elseif love.keyboard.isScancodeDown('lshift') then
-        speed = speed * 6
+        speed = speed * 4
     end
 
 	if love.keyboard.isScancodeDown('space') then

viewer/camera.lua

@@ -1,8 +1,6 @@
 
 camera = require 'camera'
-_renderer = require 'renderer'
-shtest = require 'shtest'
-renderer = _renderer
+renderer = require 'renderer'
 
 ssx, ssy = love.graphics.getDimensions()
 
@@ -15,16 +13,10 @@ love.graphics.setDefaultFilter('nearest', 'nearest')
 canvases = {}
 shaders = {}
 
-fonts = {
-    f24 = love.graphics.newFont(24),
-    f32 = love.graphics.newFont(32)
-}
-
 function love.load()
     camera.load()
     renderer.load()
-    shtest.load()
-    fpsLimit = -60
+    fpsLimit = 0
     fpsTimer = 0
 end
 
@@ -63,9 +55,6 @@ function love.keypressed(k, scancode, isRepeat)
         love.event.quit()
     elseif k == 'r' then
         camera.load()
-        renderer.load()
-    elseif k == 'tab' then
-        renderer = renderer == _renderer and shtest or _renderer
     end
 end
 

viewer/main.lua

@@ -6,19 +6,22 @@ local function nc32(w, h)
 end
 
 function renderer.load()
-    renderer.canvases = {nc32(256 * 13, 256)}
+    rx = ssx / 4
+    ry = ssy / 4
+    renderer.canvases = {nc32(rx * 13, ry)}
     renderer.shaders = {love.graphics.newShader('shaders/x.glsl')}
-    renderer.shaders[1]:send('screenSize', { 256, 256 })
+    renderer.shaders[1]:send('screenSize', { rx, ry })
     nFeats = 64
     for i=1, 6 do
         if i == 6 then
-            table.insert(renderer.canvases, love.graphics.newCanvas(256, 256))
+            table.insert(renderer.canvases, love.graphics.newCanvas(rx, ry))
         else
-            table.insert(renderer.canvases, nc32(256 * 64 / 4, 256))
+            table.insert(renderer.canvases, nc32(rx * nFeats / 4, ry))
         end
         table.insert(renderer.shaders, love.graphics.newShader('shaders/l' .. i-1 .. '.glsl'))
-        renderer.shaders[#renderer.shaders]:send('screenSize', { 256, 256 })
+        renderer.shaders[#renderer.shaders]:send('screenSize', { rx, ry })
     end
+    renderer.canvases[#renderer.canvases]:setFilter('linear', 'linear')
 end
 
 function renderer.updateImage()
@@ -47,7 +50,7 @@ end
 function renderer.draw()
     love.graphics.setColor(1, 1, 1)
     love.graphics.draw(renderer.canvases[#renderer.canvases],
-        ssx / 2, ssy / 2, 0, 2, 2, 128, 128)
+        ssx / 2, ssy / 2, 0, 4, 4, ssx / 8, ssy / 8)
 end
 
 return renderer