Fix a small bug with texture loading

SharpCoder · SharpCoder · commit 11f3555b0972 · 2023-06-16T13:37:37.000-07:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "webgl-engine",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "",
     "main": "src/index.ts",
     "scripts": {
diff --git a/src/engine.ts b/src/engine.ts
@@ -561,38 +561,43 @@ export class Engine<T> {
                 /// Apply the current texture if relevant
                 // Check if the current texture is loaded
                 if (obj.texture && obj.texture.enabled !== false) {
-                    if (!this.loader.isLoaded(obj.texture.uri)) {
+                    if (
+                        !this.loader.isLoaded(obj.texture.uri) ||
+                        obj.texture._computed === undefined
+                    ) {
                         await this._loadTextures();
                     }
 
-                    const { webglTexture, square } = obj.texture._computed;
-                    gl.bindTexture(gl.TEXTURE_2D, webglTexture);
-
-                    if (obj.texture._computed) {
-                        if (square) {
-                            gl.texParameteri(
-                                gl.TEXTURE_2D,
-                                gl.TEXTURE_WRAP_S,
-                                REPEAT_MAP[obj.texture.repeat_horizontal]
-                            );
-
-                            gl.texParameteri(
-                                gl.TEXTURE_2D,
-                                gl.TEXTURE_WRAP_T,
-                                REPEAT_MAP[obj.texture.repeat_vertical]
-                            );
-                        } else {
-                            gl.texParameteri(
-                                gl.TEXTURE_2D,
-                                gl.TEXTURE_WRAP_S,
-                                gl.CLAMP_TO_EDGE
-                            );
-
-                            gl.texParameteri(
-                                gl.TEXTURE_2D,
-                                gl.TEXTURE_WRAP_T,
-                                gl.CLAMP_TO_EDGE
-                            );
+                    if (obj && obj.texture) {
+                        const { webglTexture, square } = obj.texture._computed;
+                        gl.bindTexture(gl.TEXTURE_2D, webglTexture);
+
+                        if (obj.texture._computed) {
+                            if (square) {
+                                gl.texParameteri(
+                                    gl.TEXTURE_2D,
+                                    gl.TEXTURE_WRAP_S,
+                                    REPEAT_MAP[obj.texture.repeat_horizontal]
+                                );
+
+                                gl.texParameteri(
+                                    gl.TEXTURE_2D,
+                                    gl.TEXTURE_WRAP_T,
+                                    REPEAT_MAP[obj.texture.repeat_vertical]
+                                );
+                            } else {
+                                gl.texParameteri(
+                                    gl.TEXTURE_2D,
+                                    gl.TEXTURE_WRAP_S,
+                                    gl.CLAMP_TO_EDGE
+                                );
+
+                                gl.texParameteri(
+                                    gl.TEXTURE_2D,
+                                    gl.TEXTURE_WRAP_T,
+                                    gl.CLAMP_TO_EDGE
+                                );
+                            }
                         }
                     }
                 }
diff --git a/src/scene.ts b/src/scene.ts
@@ -131,8 +131,10 @@ export class Scene<T> {
         this.objects.splice(0, this.objects.length);
         this.vertexes = [];
         this.texcoords = [];
+        this.colors = [];
         this.vertexMetadata = {};
         this.texcoordMetadata = {};
+        this.colorMetadata = {};
     }
 
     addObject(obj: Obj3d) {
@@ -142,8 +144,6 @@ export class Scene<T> {
             const obj = queue.pop();
             if (obj) {
                 this.registerObject(obj);
-                delete obj.vertexes;
-                delete obj.texcoords;
                 this.objects.push(obj);
 
                 if (obj.children) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webgl-engine",`
`3`		`- "version": "1.0.2",`
	`3`	`+ "version": "1.0.3",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "src/index.ts",`
`6`	`6`	`"scripts": {`