increase version to v1.5.0, update glMatrix from 2.3.2 to 3.4.3

theMK2k · May 24, 2023 · 162cb67 · 162cb67
1 parent b02d56e
commit 162cb67
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 22 deletions.
diff --git a/DONE.md b/DONE.md
@@ -32,6 +32,8 @@
 - rename extlink2 to extlink (also: options, README.md, bigbox3d.config.json.example)
 - vertically center the loading div
 
+- updated gl-matrix 2.3.2 to 3.4.3
+
 ## v1.4.0
 
 - show loading counter, e.g. "loading... (3 / 6)"

diff --git a/TODO.md b/TODO.md
@@ -1,5 +1,7 @@
 # TODO
 
+- create an interactive demo site (maybe also a config generator?)
+
 - investigate normal mapping
   - <https://dev.to/ndesmic/webgl-engine-from-scratch-15-normal-maps-3227>
   - <http://olegon.github.io/html5-webgl-normalmapping/>

diff --git a/bigbox3d.js b/bigbox3d.js
@@ -1,5 +1,5 @@
 /**
- * BIG BOX 3D v1.4.0
+ * BIG BOX 3D v1.5.0
  * ©2023 Jörg "MK2k" Sonntag
  */
 
@@ -96,9 +96,9 @@ const texturen = new Array();
 
 let allLoaded = false;
 
-let mvMatrix = mat4.create();
+let mvMatrix = glMatrix.mat4.create();
 const mvMatrixStack = [];
-const pMatrix = mat4.create();
+const pMatrix = glMatrix.mat4.create();
 
 let vertBuffer = null;
 let coordBuffer = null;
@@ -459,8 +459,8 @@ function initTexture(sFilename, textures) {
 }
 
 function mvPushMatrix() {
-  const copy = mat4.create();
-  mat4.copy(copy, mvMatrix);
+  const copy = glMatrix.mat4.create();
+  glMatrix.mat4.copy(copy, mvMatrix);
   mvMatrixStack.push(copy);
 }
 
@@ -671,21 +671,21 @@ function drawScene() {
 
   //gl.uniform2fv(scalelocation, [2, 2]);
 
-  mat4.perspective(
+  glMatrix.mat4.perspective(
     pMatrix,
     perspectiveAngle,
     gl.viewportWidth / gl.viewportHeight,
     0.1,
     100.0
   );
 
-  mat4.identity(mvMatrix);
+  glMatrix.mat4.identity(mvMatrix);
 
-  mat4.translate(mvMatrix, mvMatrix, [perspectiveX, perspectiveY, -5.0]);
+  glMatrix.mat4.translate(mvMatrix, mvMatrix, [perspectiveX, perspectiveY, -5.0]);
 
-  mat4.rotate(mvMatrix, mvMatrix, degToRad(xRot), [1, 0, 0]);
-  mat4.rotate(mvMatrix, mvMatrix, degToRad(yRot), [0, 1, 0]);
-  mat4.rotate(mvMatrix, mvMatrix, degToRad(zRot), [0, 0, 0]);
+  glMatrix.mat4.rotate(mvMatrix, mvMatrix, degToRad(xRot), [1, 0, 0]);
+  glMatrix.mat4.rotate(mvMatrix, mvMatrix, degToRad(yRot), [0, 1, 0]);
+  glMatrix.mat4.rotate(mvMatrix, mvMatrix, degToRad(zRot), [0, 0, 0]);
 
   setMatrixUniforms();
 

diff --git a/gl-matrix-min.js b/gl-matrix-min.js
diff --git a/index.html b/index.html
@@ -17,7 +17,6 @@
 
 </head>
 <body>
-
   <div class="container">
     <div class="row">
       <div class="column" style="margin-top: 10%">
@@ -76,6 +75,5 @@ <h5>DOOM Mailorder</h5>
       </div>
     </div>
   </div>
-
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bigbox3d",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "A 3D Big Box web viewer. Check out the Demo Site: <https://themk2k.github.io/bigbox3d/>.",
   "main": "bigbox3d.js",
   "scripts": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ @@
     </head>
     <body>
       <div class="container">
         <div class="row">
           <div class="column" style="margin-top: 10%">
@@ Expand Down Expand Up / @@ -76,6 +75,5 @@ <h5>DOOM Mailorder</h5> @@
           </div>
         </div>
       </div>
     </body>
     </html>