Expose color argument for Frustum

Author: pxl-th

examples/demo.jl

@@ -4,12 +4,14 @@ using LinearAlgebra
 using StaticArrays
 using NeuralGraphicsGL
 
+import NeuralGraphicsGL as NGL
+
 function main()
-    NeuralGraphicsGL.init()
-    context = NeuralGraphicsGL.Context("でも"; width=1280, height=960)
-    NeuralGraphicsGL.set_resize_callback!(context, NeuralGraphicsGL.resize_callback)
+    NGL.init()
+    context = NGL.Context("でも"; width=1280, height=960)
+    NGL.set_resize_callback!(context, NGL.resize_callback)
 
-    bbox = NeuralGraphicsGL.Box(zeros(SVector{3, Float32}), ones(SVector{3, Float32}))
+    bbox = NGL.Box(zeros(SVector{3, Float32}), ones(SVector{3, Float32}))
     P = SMatrix{4, 4, Float32}(I)
     V = SMatrix{4, 4, Float32}(I)
 
@@ -24,33 +26,33 @@ function main()
     voxels_data_2 = Float32[
         0f0, 0f0, 0f0, 1f0, 0.1f0,
         0.2f0, 0f0, 0f0, 0.5f0, 0.1f0]
-    voxels = NeuralGraphicsGL.Voxels(Float32[])
+    voxels = NGL.Voxels(Float32[])
 
-    NeuralGraphicsGL.enable_blend()
+    NGL.enable_blend()
 
-    NeuralGraphicsGL.render_loop(context; destroy_context=false) do
-        NeuralGraphicsGL.imgui_begin(context)
-        NeuralGraphicsGL.clear()
-        NeuralGraphicsGL.set_clear_color(0.2, 0.2, 0.2, 1.0)
+    NGL.render_loop(context; destroy_context=false) do
+        NGL.imgui_begin(context)
+        NGL.clear()
+        NGL.set_clear_color(0.2, 0.2, 0.2, 1.0)
 
         # bmin = zeros(SVector{3, Float32}) .- Float32(delta_time) * 5f0
         # bmax = ones(SVector{3, Float32}) .- Float32(delta_time) * 5f0
-        # NeuralGraphicsGL.update_corners!(bbox, bmin, bmax)
-        # NeuralGraphicsGL.draw(bbox, P, V)
+        # NGL.update_corners!(bbox, bmin, bmax)
+        # NGL.draw(bbox, P, V)
 
-        NeuralGraphicsGL.draw_instanced(voxels, P, V)
+        NGL.draw_instanced(voxels, P, V)
 
         if 2 < elapsed_time < 4
-            NeuralGraphicsGL.update!(voxels, voxels_data_2)
+            NGL.update!(voxels, voxels_data_2)
         elseif elapsed_time > 4
-            NeuralGraphicsGL.update!(voxels, voxels_data)
+            NGL.update!(voxels, voxels_data)
         end
 
         CImGui.Begin("UI")
         CImGui.Text("HI!")
         CImGui.End()
 
-        NeuralGraphicsGL.imgui_end(context)
+        NGL.imgui_end(context)
         glfwSwapBuffers(context.window)
         glfwPollEvents()
 
@@ -60,8 +62,8 @@ function main()
         true
     end
 
-    NeuralGraphicsGL.delete!(voxels)
-    NeuralGraphicsGL.delete!(bbox)
-    NeuralGraphicsGL.delete!(context)
+    NGL.delete!(voxels)
+    NGL.delete!(bbox)
+    NGL.delete!(context)
 end
 main()

examples/framebuffer_demo.jl

@@ -8,55 +8,59 @@ using FileIO
 using ImageIO
 using NeuralGraphicsGL
 
+import NeuralGraphicsGL as NGL
+
 function main()
-    NeuralGraphicsGL.init()
-    context = NeuralGraphicsGL.Context("でも"; width=1280, height=960, resizable=false)
-    fb = NeuralGraphicsGL.Framebuffer(; width=1280, height=960)
-    screen = NeuralGraphicsGL.Screen()
+    NGL.init()
+    context = NGL.Context("でも"; width=1280, height=960, resizable=false)
+    fb = NGL.Framebuffer(; width=1280, height=960)
+    screen = NGL.Screen()
 
-    bbox = NeuralGraphicsGL.BBox(zeros(SVector{3, Float32}), ones(SVector{3, Float32}))
+    bbox = NGL.BBox(zeros(SVector{3, Float32}), ones(SVector{3, Float32}))
+    frustum = NGL.Frustum()
     P = SMatrix{4, 4, Float32}(I)
     V = SMatrix{4, 4, Float32}(I)
 
     delta_time = 0.0
     last_time = time()
     elapsed_time = 0.0
 
-    NeuralGraphicsGL.render_loop(context; destroy_context=false) do
-        NeuralGraphicsGL.imgui_begin(context)
+    NGL.render_loop(context; destroy_context=false) do
+        NGL.imgui_begin(context)
 
-        NeuralGraphicsGL.bind(fb)
+        NGL.bind(fb)
 
-        NeuralGraphicsGL.enable_depth()
-        NeuralGraphicsGL.set_clear_color(0.2, 0.2, 0.2, 1.0)
-        NeuralGraphicsGL.clear()
+        NGL.enable_depth()
+        NGL.set_clear_color(0.2, 0.2, 0.2, 1.0)
+        NGL.clear()
 
         bmin = zeros(SVector{3, Float32}) .- Float32(delta_time) * 5f0
         bmax = ones(SVector{3, Float32}) .- Float32(delta_time) * 5f0
-        NeuralGraphicsGL.update_corners!(bbox, bmin, bmax)
-        NeuralGraphicsGL.draw(bbox, P, V)
+        NGL.update_corners!(bbox, bmin, bmax)
+        NGL.draw(bbox, P, V; color=SVector{4, Float32}(0f0, 1f0, 0f0, 1f0))
+        NGL.draw(frustum, V, P, V; color=SVector{4, Float32}(0f0, 1f0, 0f0, 1f0))
 
-        NeuralGraphicsGL.unbind(fb)
+        NGL.unbind(fb)
 
-        NeuralGraphicsGL.disable_depth()
-        NeuralGraphicsGL.set_clear_color(0.0, 0.0, 0.0, 1.0)
-        NeuralGraphicsGL.clear(GL_COLOR_BUFFER_BIT)
+        NGL.disable_depth()
+        NGL.set_clear_color(0.0, 0.0, 0.0, 1.0)
+        NGL.clear(GL_COLOR_BUFFER_BIT)
 
         screen_texture = fb[GL_COLOR_ATTACHMENT0]
-        drawed_data = NeuralGraphicsGL.get_data(screen_texture)
+        drawed_data = NGL.get_data(screen_texture)
         save("screen.png", rotl90(colorview(RGB{N0f8}, drawed_data)))
 
         depth_texture = fb[GL_DEPTH_ATTACHMENT]
-        depth_data = NeuralGraphicsGL.get_data(depth_texture)[1, :, :]
+        depth_data = NGL.get_data(depth_texture)[1, :, :]
         save("depth.png", rotl90(colorview(Gray{Float32}, depth_data)))
 
-        NeuralGraphicsGL.draw(screen, screen_texture)
+        NGL.draw(screen, screen_texture)
 
         CImGui.Begin("UI")
         CImGui.Text("HI!")
         CImGui.End()
 
-        NeuralGraphicsGL.imgui_end(context)
+        NGL.imgui_end(context)
         glfwSwapBuffers(context.window)
         glfwPollEvents()
 
@@ -67,9 +71,9 @@ function main()
         false
     end
 
-    NeuralGraphicsGL.delete!(bbox)
-    NeuralGraphicsGL.delete!(screen)
-    NeuralGraphicsGL.delete!(fb)
-    NeuralGraphicsGL.delete!(context)
+    NGL.delete!(bbox)
+    NGL.delete!(screen)
+    NGL.delete!(fb)
+    NGL.delete!(context)
 end
 main()

src/frustum.jl

@@ -18,5 +18,8 @@ end
 - `fL`: Frustum camera's look at matrix.
 - `P`: User controlled camera's perspective matrix.
 - `L`: User controlled camera's look at matrix.
+- `color`: Color of the frustum.
 """
-draw(f::Frustum, fL, P, L) = draw(f.box_clip_space, P, L * inv(fL))
+function draw(f::Frustum, fL, P, L; color::SVec4f0 = SVec4f0(1f0, 0f0, 0f0, 1f0))
+    draw(f.box_clip_space, P, L * inv(fL); color)
+end