GLSL modules are now in own submodule, removed now-pointless intermed…

…iate Lua directory; comments fixed up
ggcrunchy · Apr 11, 2015 · 04faff6 · 04faff6
1 parent c2496c2
commit 04faff6
Show file tree

Hide file tree

Showing 22 changed files with 87 additions and 1,085 deletions.
diff --git a/lua/effect_props.lua → effect_props.lua b/lua/effect_props.lua → effect_props.lua
diff --git a/lua/encode/utils.lua → encode/utils.lua b/lua/encode/utils.lua → encode/utils.lua
@@ -26,7 +26,7 @@
 -- Standard library imports --
 
 -- Modules --
-local effect_props = require("corona_shader.lua.effect_props")
+local effect_props = require("corona_shader.effect_props")
 
 -- Exports --
 local M = {}

diff --git a/lua/encode/vars/lattice10_open.lua → encode/vars/lattice10_open.lua b/lua/encode/vars/lattice10_open.lua → encode/vars/lattice10_open.lua
@@ -1,5 +1,5 @@
---- Lua-side data-encoding routines for [0, 1023] x [0, 1) pairs, where the integer
--- part describes a quantized lattice of dimension 2^m x 2^n, s.t. m + n = 10.
+--- Data-encoding routines for [0, 1023] x [0, 1) pairs, where the integer part describes a
+-- quantized lattice of dimension 2^m x 2^n, s.t. m + n = 10.
 
 --
 -- Permission is hereby granted, free of charge, to any person obtaining

diff --git a/lua/encode/vars/lattice10_unit.lua → encode/vars/lattice10_unit.lua b/lua/encode/vars/lattice10_unit.lua → encode/vars/lattice10_unit.lua
@@ -1,5 +1,5 @@
---- Lua-side data-encoding routines for [0, 1023] x [0, 1] pairs, where the integer
--- part describes a quantized lattice of dimension 2^m x 2^n, s.t. m + n = 10.
+--- Data-encoding routines for [0, 1023] x [0, 1] pairs, where the integer part describes a
+-- quantized lattice of dimension 2^m x 2^n, s.t. m + n = 10.
 
 --
 -- Permission is hereby granted, free of charge, to any person obtaining

diff --git a/lua/encode/vars/sint10_open.lua → encode/vars/sint10_open.lua b/lua/encode/vars/sint10_open.lua → encode/vars/sint10_open.lua
@@ -1,6 +1,6 @@
---- Lua-side data-encoding routines for <+,->[0, 1022] x [0, 1) pairs, where the sign is
--- understood to be a separate piece of information. Note that the integer range is one
--- shorter than in most encodings.
+--- Data-encoding routines for <+,->[0, 1022] x [0, 1) pairs, where the sign is understood to
+-- be a separate piece of information. Note that the integer range is one fewer than in most
+-- encodings.
 
 --
 -- Permission is hereby granted, free of charge, to any person obtaining

diff --git a/lua/encode/vars/uint10_open.lua → encode/vars/uint10_open.lua b/lua/encode/vars/uint10_open.lua → encode/vars/uint10_open.lua
@@ -1,4 +1,4 @@
---- Lua-side data-encoding routines for [0, 1023] x [0, 1) pairs.
+--- Data-encoding routines for [0, 1023] x [0, 1) pairs.
 
 --
 -- Permission is hereby granted, free of charge, to any person obtaining

diff --git a/lua/encode/vars/uint10_unit.lua → encode/vars/uint10_unit.lua b/lua/encode/vars/uint10_unit.lua → encode/vars/uint10_unit.lua
@@ -1,4 +1,4 @@
---- Lua-side data-encoding routines for [0, 1023] x [0, 1] pairs.
+--- Data-encoding routines for [0, 1023] x [0, 1] pairs.
 
 --
 -- Permission is hereby granted, free of charge, to any person obtaining

diff --git a/lua/encode/vars/uint5_pair_open.lua → encode/vars/uint5_pair_open.lua b/lua/encode/vars/uint5_pair_open.lua → encode/vars/uint5_pair_open.lua
@@ -1,4 +1,4 @@
---- Lua-side data-encoding routines for [0, 31] x [0, 31] x [0, 1) triples.
+--- Data-encoding routines for [0, 31] x [0, 31] x [0, 1) triples.
 
 --
 -- Permission is hereby granted, free of charge, to any person obtaining

diff --git a/lua/encode/vars/uint5_pair_unit.lua → encode/vars/uint5_pair_unit.lua b/lua/encode/vars/uint5_pair_unit.lua → encode/vars/uint5_pair_unit.lua
@@ -1,4 +1,4 @@
---- Lua-side data-encoding routines for [0, 31] x [0, 31] x [0, 1] triples.
+--- Data-encoding routines for [0, 31] x [0, 31] x [0, 1] triples.
 
 --
 -- Permission is hereby granted, free of charge, to any person obtaining

diff --git a/lua/encode/vars/uint5_quad.lua → encode/vars/uint5_quad.lua b/lua/encode/vars/uint5_quad.lua → encode/vars/uint5_quad.lua
@@ -1,4 +1,4 @@
---- Lua-side data-packing routines for [0, 31] x [0, 31] x [0, 31] x [0, 31] quads.
+--- Data-packing routines for [0, 31] x [0, 31] x [0, 31] x [0, 31] quads.
 
 --
 -- Permission is hereby granted, free of charge, to any person obtaining

diff --git a/lua/encode/vars/unit_open.lua → encode/vars/unit_open.lua b/lua/encode/vars/unit_open.lua → encode/vars/unit_open.lua
@@ -1,4 +1,4 @@
---- Lua-side data-encoding routines for [0, 1] x [0, 1) pairs.
+--- Data-encoding routines for [0, 1] x [0, 1) pairs.
 
 --
 -- Permission is hereby granted, free of charge, to any person obtaining

diff --git a/lua/encode/vars/unit_pair.lua → encode/vars/unit_pair.lua b/lua/encode/vars/unit_pair.lua → encode/vars/unit_pair.lua
@@ -1,4 +1,4 @@
---- Lua-side data-encoding routines for [0, 1] x [0, 1] pairs.
+--- Data-encoding routines for [0, 1] x [0, 1] pairs.
 
 --
 -- Permission is hereby granted, free of charge, to any person obtaining
@@ -28,8 +28,8 @@ local abs = math.abs
 local floor = math.floor
 
 -- Modules --
-local effect_props = require("corona_shader.lua.effect_props")
-local encoding_utils = require("corona_shader.lua.encode.utils")
+local effect_props = require("corona_shader.effect_props")
+local encoding_utils = require("corona_shader.encode.utils")
 
 -- Cached module references --
 local _FromXY_
@@ -40,7 +40,7 @@ local M = {}
 
 --- Adds a unit pair-style parameter to a kernel.
 --
--- Some property data is also added for the parameter, cf. @{corona_shader.lua.effect_props.AddVertexProperty}.
+-- Some property data is also added for the parameter, cf. @{corona_shader.effect_props.AddVertexProperty}.
 -- @ptable kernel Corona shader kernel.
 -- @uint index Vertex userdata component index, cf. @{VertexDatum}.
 -- @string prop1 Friendly name of number #1...

diff --git a/glsl/bump.lua b/glsl/bump.lua
diff --git a/glsl/constants.lua b/glsl/constants.lua
diff --git a/glsl/decode_vars.lua b/glsl/decode_vars.lua
diff --git a/glsl/neighbors.lua b/glsl/neighbors.lua