[WIP] Dependency: reason-glfw -> 3.2.1002 (mono#61)

Dependency: reason-glfw -> 3.2.1002

package.json

@@ -26,7 +26,8 @@
   "dependencies": {
     "@esy-ocaml/reason": "^3.3.7",
     "reason-fontkit": "^1.0.0",
-    "reason-glfw": "^1.0.0",
+    "reason-glfw": "^3.2.1002",
+    "reason-fontkit": "^1.1.0",
     "reason-gl-matrix": "^0.2.0",
     "reason-reactify": "^1.0.1",
     "@opam/lwt": "^4.0.0",

src/Core/App.re

@@ -1,4 +1,4 @@
-open Reglfw.Glfw;
+open Reglfw;
 
 type reducer('s, 'a) = ('s, 'a) => 's;
 
@@ -52,11 +52,11 @@ let startWithState: startFunc('s, 'a) =
       needsRender: true,
     };
 
-    let _ = glfwInit();
+    let _ = Glfw.glfwInit();
     let _ = initFunc(appInstance);
 
     let appLoop = (_t: float) => {
-      glfwPollEvents();
+      Glfw.glfwPollEvents();
       if (appInstance.needsRender) {
         Performance.bench("renderWindows", () => {
           List.iter(w => Window.render(w), getWindows(appInstance));
@@ -73,7 +73,7 @@ let startWithState: startFunc('s, 'a) =
       false;
     };
 
-    glfwRenderLoop(appLoop);
+    Glfw.glfwRenderLoop(appLoop);
   };
 
 let start = (initFunc: appInitFunc(unit, unit)) =>

src/Core/Window.re

@@ -20,7 +20,7 @@ type keyEvent = {
 type windowRenderCallback = unit => unit;
 type t = {
   mutable backgroundColor: Color.t,
-  glfwWindow: window,
+  glfwWindow: Window.t,
   render: ref(option(windowRenderCallback)),
   mutable width: int,
   mutable height: int,

src/Shaders/BasicShader.re

@@ -1,30 +1,29 @@
 /**
  * Basic Shader
- * 
+ *
  * Simple shader demonstrating usage of attributes, uniforms, and varying parameters.
  */
-
 open Shader;
 
 let attribute: list(ShaderAttribute.t) = [
-{
-  dataType: ShaderDataType.Vector3,
-  name: "aVertexPosition",
-  channel: Position,
-}];
-
-let uniform: list(ShaderUniform.t) = [{
+  {
     dataType: ShaderDataType.Vector3,
-    name: "uColor",
-    usage: VertexShader,
-}];
+    name: "aVertexPosition",
+    channel: Position,
+  },
+];
 
-let varying: list(ShaderVarying.t) = [{
+let uniform: list(ShaderUniform.t) = [
+  {dataType: ShaderDataType.Vector3, name: "uColor", usage: VertexShader},
+];
+
+let varying: list(ShaderVarying.t) = [
+  {
     dataType: ShaderDataType.Vector3,
     name: "vColor",
     precision: ShaderPrecision.Low,
-}];
-
+  },
+];
 
 let vsShader = {|
    gl_Position = vec4(aVertexPosition, 1.0);
@@ -40,7 +39,7 @@ let create = () => {
     Shader.create(
       ~attributes=attribute,
       ~uniforms=uniform,
-      ~varying=varying,
+      ~varying,
       ~vertexShader=vsShader,
       ~fragmentShader=fsShader,
     );