Merge pull request #85 from wedesoft/main

minor changes to LWJGL/OpenGL article

Author: timothypratley

site/opengl_visualization/main.qmd

@@ -39,7 +39,9 @@ First we need to get some libraries and we can use add-libs to fetch them.
            'org.lwjgl/lwjgl-stb                  {:mvn/version "3.3.6"}
            'org.lwjgl/lwjgl-stb$natives-linux    {:mvn/version "3.3.6"}
            'generateme/fastmath                  {:mvn/version "3.0.0-alpha3"}})
-(require '[clojure.java.io :as io])
+(require '[clojure.java.io :as io]
+         '[clojure.math :refer (PI to-radians)]
+         '[fastmath.vector :refer (vec3 sub add mult normalize)])
 (import '[javax.imageio ImageIO]
         '[org.lwjgl BufferUtils]
         '[org.lwjgl.glfw GLFW]
@@ -178,7 +180,7 @@ Next we need to set up OpenGL rendering for this window.
 
 ::: {.printedClojure}
 ```clojure
-#object[org.lwjgl.opengl.GLCapabilities 0x688b081a "org.lwjgl.opengl.GLCapabilities@688b081a"]
+#object[org.lwjgl.opengl.GLCapabilities 0x7a05815c "org.lwjgl.opengl.GLCapabilities@7a05815c"]
 
 ```
 :::
@@ -1738,7 +1740,6 @@ uniform float resolution;
 uniform sampler2D moon;
 uniform sampler2D ldem;
 in vec3 vpoint;
-in mat3 horizon;
 out vec4 fragColor;
 
 vec3 orthogonal_vector(vec3 n)
@@ -2016,6 +2017,7 @@ nil
 
 
 I hope you liked this 3D graphics example.
+You can get an interactive version of the Moon rendering [here](https://github.com/wedesoft/macroexpand-noj-lwjgl).
 
 Note that in practise you will
 

src/opengl_visualization/main.clj

@@ -32,7 +32,9 @@
 ;;            'org.lwjgl/lwjgl-stb                  {:mvn/version "3.3.6"}
 ;;            'org.lwjgl/lwjgl-stb$natives-linux    {:mvn/version "3.3.6"}
 ;;            'generateme/fastmath                  {:mvn/version "3.0.0-alpha3"}})
-;; (require '[clojure.java.io :as io])
+;; (require '[clojure.java.io :as io]
+;;          '[clojure.math :refer (PI to-radians)]
+;;          '[fastmath.vector :refer (vec3 sub add mult normalize)])
 ;; (import '[javax.imageio ImageIO]
 ;;         '[org.lwjgl BufferUtils]
 ;;         '[org.lwjgl.glfw GLFW]
@@ -716,7 +718,6 @@ uniform float resolution;
 uniform sampler2D moon;
 uniform sampler2D ldem;
 in vec3 vpoint;
-in mat3 horizon;
 out vec4 fragColor;
 
 vec3 orthogonal_vector(vec3 n)
@@ -834,6 +835,7 @@ void main()
 (GLFW/glfwTerminate)
 
 ;; I hope you liked this 3D graphics example.
+;; You can get an interactive version of the Moon rendering [here](https://github.com/wedesoft/macroexpand-noj-lwjgl).
 ;;
 ;; Note that in practise you will
 ;;