21c5e6d2f665 — Leonard Ritter tukan 2 years ago
* renamed project from Liminal to Tukan
45 files changed, 58 insertions(+), 67 deletions(-)

M genie.lua
M include/liminal/city.h => include/tukan/city.h
M include/liminal/config.h => include/tukan/config.h
M include/liminal/imgui_dock.h => include/tukan/imgui_dock.h
M include/liminal/imgui_impl_sdl_gl3.h => include/tukan/imgui_impl_sdl_gl3.h
M include/liminal/liminal.h => include/tukan/tukan.h
M main.sc
M src/liminal/city.cpp => src/tukan/city.cpp
M src/liminal/everything.h => src/tukan/everything.h
M src/liminal/imgui_dock.cpp => src/tukan/imgui_dock.cpp
M src/liminal/imgui_impl_sdl_gl3.cpp => src/tukan/imgui_impl_sdl_gl3.cpp
M src/liminal/liminal.cpp => src/tukan/tukan.cpp
R test.frag => 
M testing/test_audio.sc
M testing/test_compute.sc
M testing/test_dockgui.sc
M testing/test_sdl.sc
M testing/test_vulkan.sc
M liminal/audio.sc => tukan/audio.sc
M liminal/color.sc => tukan/color.sc
M liminal/core.sc => tukan/core.sc
M liminal/csg.sc => tukan/csg.sc
M liminal/csgpainter.sc => tukan/csgpainter.sc
M liminal/derivative.sc => tukan/derivative.sc
M liminal/dockgui.sc => tukan/dockgui.sc
M liminal/fog.sc => tukan/fog.sc
M liminal/gl.sc => tukan/gl.sc
M liminal/glmain.sc => tukan/glmain.sc
M liminal/hash.sc => tukan/hash.sc
M liminal/icons/font_awesome.sc => tukan/icons/font_awesome.sc
M liminal/icons/init.sc => tukan/icons/init.sc
M liminal/icons/kenney.sc => tukan/icons/kenney.sc
M liminal/icons/material_design.sc => tukan/icons/material_design.sc
M liminal/imgui/init.sc => tukan/imgui/init.sc
M liminal/libc.sc => tukan/libc.sc
M liminal/normal.sc => tukan/normal.sc
M liminal/packing.sc => tukan/packing.sc
M liminal/projection.sc => tukan/projection.sc
M liminal/rotation.sc => tukan/rotation.sc
M liminal/screen.sc => tukan/screen.sc
M liminal/sdf.sc => tukan/sdf.sc
M liminal/sdl.sc => tukan/sdl.sc
M liminal/ssao.sc => tukan/ssao.sc
M liminal/stage.sc => tukan/stage.sc
M liminal/vulkan.sc => tukan/vulkan.sc
M genie.lua +10 -10
@@ 25,7 25,7 @@ end
 -- TODO: osx needs to have this set to false or something, it always seems to think this dir exists...
 local HAS_OVRSDK = os.isdir(path.join(THISDIR, 'build', 'src', 'ovrsdk'))
 
-solution "Liminal"
+solution "Tukan"
     location ( "build" )
     configurations { "Debug", "Release" }
     platforms {"native", "x64", "x32"}

          
@@ 55,17 55,17 @@ solution "Liminal"
             "-fno-strict-aliasing"
         }
 
-    project "liminal_core"
+    project "tukan_core"
         kind "SharedLib"
         language "C++"
         files {
             "src/glad.c",
-            "src/liminal/*.cpp",
-            "src/liminal/*.c",
-            "src/liminal/*.h",
-            -- "src/liminal/editor/*.cpp",
-            -- "src/liminal/editor/*.h",
-            "include/liminal/*.h",
+            "src/tukan/*.cpp",
+            "src/tukan/*.c",
+            "src/tukan/*.h",
+            -- "src/tukan/editor/*.cpp",
+            -- "src/tukan/editor/*.h",
+            "include/tukan/*.h",
 
             "src/stb/*.c",
 

          
@@ 99,7 99,7 @@ solution "Liminal"
             links {
                 "ovr",
             }
-            defines "LIMINAL_OVRSDK"
+            defines "TUKAN_OVRSDK"
         end
 
         configuration { "linux" }

          
@@ 139,7 139,7 @@ solution "Liminal"
             }
             --links { "nanovg", "stk", "tess2", "glew", "opengl32", "comctl32" }
             links { "nanovg", "SDL2", "comctl32", "imm32", "uuid", "ole32", "stdc++" }
-            defines { "LIMINAL_DLL" }
+            defines { "TUKAN_DLL" }
             buildoptions_cpp {
                 "-fmax-errors=1",
             }

          
M include/liminal/city.h => include/tukan/city.h +0 -0

        
M include/liminal/config.h => include/tukan/config.h +0 -0

        
M include/liminal/imgui_dock.h => include/tukan/imgui_dock.h +0 -0

        
M include/liminal/imgui_impl_sdl_gl3.h => include/tukan/imgui_impl_sdl_gl3.h +0 -0

        
M include/liminal/liminal.h => include/tukan/tukan.h +0 -0

        
M main.sc +10 -10
@@ 1,22 1,22 @@ 
 #!/usr/bin/env scopes
 
-import .liminal.glmain
-import .liminal.screen
-#import .liminal.imgui
+import .tukan.glmain
+import .tukan.screen
+#import .tukan.imgui
 
-let glmain = liminal.glmain
-let screen = liminal.screen
+let glmain = tukan.glmain
+let screen = tukan.screen
 
-import .liminal.dockgui
-let dockgui = liminal.dockgui
+import .tukan.dockgui
+let dockgui = tukan.dockgui
 
 using import glm
 using import glsl
-using import .liminal.gl
-using import .liminal.imgui
+using import .tukan.gl
+using import .tukan.imgui
 
 glmain.init
-    title = "Liminal"
+    title = "Tukan"
     width = 960
     height = 540
     resizable = true

          
M src/liminal/city.cpp => src/tukan/city.cpp +1 -1
@@ 28,7 28,7 @@ 
 // compromising on hash quality.
 
 
-#include "liminal/city.h"
+#include "tukan/city.h"
 
 #include <utility>
 #include <algorithm>

          
M src/liminal/everything.h => src/tukan/everything.h +0 -0

        
M src/liminal/imgui_dock.cpp => src/tukan/imgui_dock.cpp +1 -1
@@ 4,7 4,7 @@ 
 #define IMGUI_DEFINE_PLACEMENT_NEW
 #define IMGUI_DEFINE_MATH_OPERATORS
 #include "imgui_internal.h"
-#include "liminal/imgui_dock.h"
+#include "tukan/imgui_dock.h"
 //#include "engine/fs/os_file.h"
 //#include <lua.hpp>
 

          
M src/liminal/imgui_impl_sdl_gl3.cpp => src/tukan/imgui_impl_sdl_gl3.cpp +1 -1
@@ 9,7 9,7 @@ 
 // https://github.com/ocornut/imgui
 
 #include "imgui.h"
-#include "liminal/imgui_impl_sdl_gl3.h"
+#include "tukan/imgui_impl_sdl_gl3.h"
 
 // SDL,GL3W
 #include <SDL.h>

          
M src/liminal/liminal.cpp => src/tukan/tukan.cpp +1 -1
@@ 15,7 15,7 @@ 
 #include "nfd.h"
 #include "../stb/stb_image_write.c"
 
-#include "liminal/config.h"
+#include "tukan/config.h"
 
 extern "C" {
 LM_EXPORT int lm_test();

          
R test.frag =>  +0 -8
@@ 1,8 0,0 @@ 
-#version 450
-
-layout(location=0) uniform sampler2D tex;
-
-layout(location=0) out vec4 color;
-void main() {
-    color = texture(tex, gl_FragCoord.xy);
-}

          
M testing/test_audio.sc +7 -8
@@ 1,8 1,8 @@ 
 
 using import glm
-import ..liminal.audio
-using import ..liminal.sdl
-let audio = liminal.audio
+import ..tukan.audio
+using import ..tukan.sdl
+let audio = tukan.audio
 
 let SAMPLESIZE = 44100
 let pi2 = (pi * 2.0)

          
@@ 15,8 15,8 @@ fn fmod (x y)
     x - (trunc (x / y)) * y
 
 fn seq (t s)
-    "f32 f32 <- f32 f32
-     returns note index, fract"
+    """"f32 f32 <- f32 f32
+        returns note index, fract
     vec2
         trunc (t / s)
         fmod t s

          
@@ 107,9 107,8 @@ fn bpm (b)
     60.0 / b
 
 fn limit (x n)
-    "a simple amplitude limiter
-    n is the value of the first derivative at x=0
-    "
+    """"a simple amplitude limiter
+        n is the value of the first derivative at x=0
     let n =
         if (none? n) 1.0
         else n

          
M testing/test_compute.sc +6 -6
@@ 1,16 1,16 @@ 
 #!/usr/bin/env scopes
 
-import ..liminal.glmain
-import ..liminal.screen
+import ..tukan.glmain
+import ..tukan.screen
 import glsl
 
-let glmain = liminal.glmain
-let screen = liminal.screen
+let glmain = tukan.glmain
+let screen = tukan.screen
 
 using import glm
 using import glsl
-using import ..liminal.gl
-using import ..liminal.imgui
+using import ..tukan.gl
+using import ..tukan.imgui
 
 glmain.init
     title = "Liminal"

          
M testing/test_dockgui.sc +10 -10
@@ 1,21 1,21 @@ 
 #!/usr/bin/env scopes
 
-import ..liminal.glmain
-import ..liminal.screen
-#import ..liminal.imgui
-import ..liminal.dockgui
+import ..tukan.glmain
+import ..tukan.screen
+#import ..tukan.imgui
+import ..tukan.dockgui
 
-let glmain = liminal.glmain
-let screen = liminal.screen
-let dockgui = liminal.dockgui
+let glmain = tukan.glmain
+let screen = tukan.screen
+let dockgui = tukan.dockgui
 
-using import ..liminal.gl
+using import ..tukan.gl
 using import glm
 using import glsl
-using import ..liminal.imgui
+using import ..tukan.imgui
 
 glmain.init
-    title = "Liminal"
+    title = "Tukan"
     width = 800
     height = 600
     resizable = true

          
M testing/test_sdl.sc +2 -2
@@ 1,5 1,5 @@ 
 
-using import ..liminal.sdl
+using import ..tukan.sdl
 
 fn main (argc argv)
     var context = (nullof SDL_GLContext)

          
@@ 69,7 69,7 @@ fn main (argc argv)
             swap;
 
     init
-        title = "Liminal"
+        title = "Tukan"
         width = 800
         height = 600
         resizable = true

          
M testing/test_vulkan.sc +5 -5
@@ 1,10 1,10 @@ 
 
 
-using import ..liminal.vulkan
+using import ..tukan.vulkan
 
-import ..liminal.sdl
-let sdl = liminal.sdl
-using import ..liminal.sdl
+import ..tukan.sdl
+let sdl = tukan.sdl
+using import ..tukan.sdl
 
 fn main ()
     #var context = (nullof SDL_GLContext)

          
@@ 131,7 131,7 @@ fn main ()
             swap;
 
     init
-        title = "Liminal"
+        title = "Tukan"
         width = 800
         height = 600
         resizable = true

          
M liminal/audio.sc => tukan/audio.sc +0 -0

        
M liminal/color.sc => tukan/color.sc +0 -0

        
M liminal/core.sc => tukan/core.sc +2 -2
@@ 1,9 1,9 @@ 
 
 if (operating-system == 'windows)
     load-library
-        module-dir .. "/../bin/liminal_core.dll"
+        module-dir .. "/../bin/tukan_core.dll"
 else
     load-library
-        module-dir .. "/../bin/libliminal_core.so"
+        module-dir .. "/../bin/libtukan_core.so"
 
 none

          
M liminal/csg.sc => tukan/csg.sc +0 -0

        
M liminal/csgpainter.sc => tukan/csgpainter.sc +0 -0

        
M liminal/derivative.sc => tukan/derivative.sc +0 -0

        
M liminal/dockgui.sc => tukan/dockgui.sc +0 -0

        
M liminal/fog.sc => tukan/fog.sc +0 -0

        
M liminal/gl.sc => tukan/gl.sc +0 -0

        
M liminal/glmain.sc => tukan/glmain.sc +0 -0

        
M liminal/hash.sc => tukan/hash.sc +0 -0

        
M liminal/icons/font_awesome.sc => tukan/icons/font_awesome.sc +0 -0

        
M liminal/icons/init.sc => tukan/icons/init.sc +0 -0

        
M liminal/icons/kenney.sc => tukan/icons/kenney.sc +0 -0

        
M liminal/icons/material_design.sc => tukan/icons/material_design.sc +0 -0

        
M liminal/imgui/init.sc => tukan/imgui/init.sc +1 -1
@@ 8,7 8,7 @@ let lib =
         """"
             #include "imgui.h"
             #include "cimgui.h"
-            #include "liminal/imgui_dock.h"
+            #include "tukan/imgui_dock.h"
             #include <stdio.h>
         list
             \ "-I" (module-dir .. "/../../cdefs")

          
M liminal/libc.sc => tukan/libc.sc +0 -0

        
M liminal/normal.sc => tukan/normal.sc +0 -0

        
M liminal/packing.sc => tukan/packing.sc +0 -0

        
M liminal/projection.sc => tukan/projection.sc +0 -0

        
M liminal/rotation.sc => tukan/rotation.sc +0 -0

        
M liminal/screen.sc => tukan/screen.sc +0 -0

        
M liminal/sdf.sc => tukan/sdf.sc +0 -0

        
M liminal/sdl.sc => tukan/sdl.sc +1 -1
@@ 12,7 12,7 @@ define lib
             #include "SDL2/SDL.h"
             #include "SDL2/SDL_syswm.h"
             #include "SDL2/SDL_vulkan.h"
-            #include "liminal/imgui_impl_sdl_gl3.h"
+            #include "tukan/imgui_impl_sdl_gl3.h"
 
             void SDL__VERSION (SDL_version *val) {
                 SDL_VERSION(val);

          
M liminal/ssao.sc => tukan/ssao.sc +0 -0

        
M liminal/stage.sc => tukan/stage.sc +0 -0

        
M liminal/vulkan.sc => tukan/vulkan.sc +0 -0