support "JOINTS" and "WEIGHTS" semantic variants; fix issues with loading and caching texture images; etc.

peteroupc · peteroupc · commit 32e09c1b8bcd · 2017-04-15T10:23:59.000-04:00
diff --git a/demos/tris.html b/demos/tris.html
@@ -118,6 +118,7 @@
 var scene = new H3DU.Scene3D(document.getElementById("canvas"))
    .setClearColor("white");
 var sub = new H3DU.Batch3D();
+sub.getLights().setBasic();
 var tris = new TriangleParticles(sub, 200, scene.getWidth(), scene.getHeight());
   // Set up the render loop
 H3DU.renderLoop(function(time) {
diff --git a/doc/H3DU.PbrMaterial.md b/doc/H3DU.PbrMaterial.md
@@ -31,12 +31,12 @@ or 1 minus roughness, and the roughness map is treated as a "glossiness"
 map, or an inverted roughness map.
 * [metalness](#H3DU.PbrMaterial_metalness)<br>A value indicating whether objects described by this material are metals.
 * [metalnessMap](#H3DU.PbrMaterial_metalnessMap)<br>A texture indicating the metalness of each part of the texture,
-as specified in the texture's red channel.
+as specified in the texture's blue channel.
 * [normalMap](#H3DU.PbrMaterial_normalMap)<br>Normal map (bump map) texture.
 * [roughness](#H3DU.PbrMaterial_roughness)<br>Describes the roughness of the surface described
 by this material.
 * [roughnessMap](#H3DU.PbrMaterial_roughnessMap)<br>A texture indicating the roughness of each part of the texture,
-as specified in the texture's red channel.
+as specified in the texture's green channel.
 * [shader](#H3DU.PbrMaterial_shader)<br>Shader program to use when rendering objects with this material.
 * [specular](#H3DU.PbrMaterial_specular)<br>Specular reflectivity of this material.
 * [specularMap](#H3DU.PbrMaterial_specularMap)<br>A texture where each pixel identifies the "specular" property of that
@@ -163,8 +163,8 @@ Default Value: `0`
 ### H3DU.PbrMaterial#metalnessMap
 
 A texture indicating the metalness of each part of the texture,
-as specified in the texture's red channel.
-Each pixel value in the red channel (which ranges from 0-255 in most image
+as specified in the texture's blue channel.
+Each pixel value in the blue channel (which ranges from 0-255 in most image
 formats) is scaled to the range [0, 1].
 
 This value is only used in the <b>metallic workflow</b>.
@@ -228,8 +228,8 @@ Default Value: `0.35`
 ### H3DU.PbrMaterial#roughnessMap
 
 A texture indicating the roughness of each part of the texture,
-as specified in the texture's red channel.
-Each pixel value in the red channel (which ranges from 0-255 in most image
+as specified in the texture's green channel.
+Each pixel value in the green channel (which ranges from 0-255 in most image
 formats) is scaled to the range [0, 1].
 
 The inverse of roughness is <i>glossiness</i> or <i>smoothness</i>;
diff --git a/doc/H3DU.Semantic.md b/doc/H3DU.Semantic.md
@@ -71,11 +71,13 @@ Uniform semantic for a model-view-projection matrix.
 ### H3DU.Semantic.NORMAL (constant)
 
 Attribute semantic for a vertex normal.
+The default shader uses 3-dimensional normals.
 
 <a name='H3DU.Semantic.POSITION'></a>
 ### H3DU.Semantic.POSITION (constant)
 
 Attribute semantic for a vertex position.
+The default shader uses 3-dimensional positions.
 
 <a name='H3DU.Semantic.PROJECTION'></a>
 ### H3DU.Semantic.PROJECTION (constant)
@@ -92,6 +94,15 @@ Attribute semantic for a tangent vector.
 
 Attribute semantic for a texture coordinate.
 
+Note that the default shader supports only 2-dimensional
+texture coordinates. For such texturing tasks as mapping
+a square to a trapezoid, 3-dimensional texture coordinates
+are useful to ensure the texturing is perspective-correct.
+In this case, the 3-D texture coordinates are converted
+to 2-D by dividing the X and Y components by the Z component.
+In a fragment shader, this can look like the following
+code: <code>texCoord.xy/texCoord.z</code>.
+
 <a name='H3DU.Semantic.VIEW'></a>
 ### H3DU.Semantic.VIEW (constant)
 
diff --git a/doc/H3DU.TextureLoader.md b/doc/H3DU.TextureLoader.md
@@ -41,7 +41,7 @@ Gets an already loaded texture by name from this texture loader.
 #### Return Value
 
 The texture with the given name, or null
-if it doesn't exist. (Type: <a href="H3DU.Texture.md">H3DU.Texture</a>)
+if it isn't fully loaded or doesn't exist. (Type: <a href="H3DU.Texture.md">H3DU.Texture</a>)
 
 <a name='H3DU.TextureLoader_loadAndMapTexture'></a>
 ### H3DU.TextureLoader#loadAndMapTexture(texture, context)
diff --git a/dochtml/H3DU.PbrMaterial.html b/dochtml/H3DU.PbrMaterial.html
@@ -8,9 +8,9 @@ <h3> H3DU.PbrMaterial([params])</h3>A material for physically-based rendering. S
 in the red, green, blue, and alpha channels.<li><a href='#H3DU.PbrMaterial_emission'>emission</a><br>Additive color emitted by objects with this material.<li><a href='#H3DU.PbrMaterial_emissionMap'>emissionMap</a><br>Emission map texture.<li><a href='#H3DU.PbrMaterial_invertRoughness'>invertRoughness</a><br>If true, the roughness property is treated as a "glossiness" property,
 or 1 minus roughness, and the roughness map is treated as a "glossiness"
 map, or an inverted roughness map.<li><a href='#H3DU.PbrMaterial_metalness'>metalness</a><br>A value indicating whether objects described by this material are metals.<li><a href='#H3DU.PbrMaterial_metalnessMap'>metalnessMap</a><br>A texture indicating the metalness of each part of the texture,
-as specified in the texture's red channel.<li><a href='#H3DU.PbrMaterial_normalMap'>normalMap</a><br>Normal map (bump map) texture.<li><a href='#H3DU.PbrMaterial_roughness'>roughness</a><br>Describes the roughness of the surface described
+as specified in the texture's blue channel.<li><a href='#H3DU.PbrMaterial_normalMap'>normalMap</a><br>Normal map (bump map) texture.<li><a href='#H3DU.PbrMaterial_roughness'>roughness</a><br>Describes the roughness of the surface described
 by this material.<li><a href='#H3DU.PbrMaterial_roughnessMap'>roughnessMap</a><br>A texture indicating the roughness of each part of the texture,
-as specified in the texture's red channel.<li><a href='#H3DU.PbrMaterial_shader'>shader</a><br>Shader program to use when rendering objects with this material.<li><a href='#H3DU.PbrMaterial_specular'>specular</a><br>Specular reflectivity of this material.<li><a href='#H3DU.PbrMaterial_specularMap'>specularMap</a><br>A texture where each pixel identifies the "specular" property of that
+as specified in the texture's green channel.<li><a href='#H3DU.PbrMaterial_shader'>shader</a><br>Shader program to use when rendering objects with this material.<li><a href='#H3DU.PbrMaterial_specular'>specular</a><br>Specular reflectivity of this material.<li><a href='#H3DU.PbrMaterial_specularMap'>specularMap</a><br>A texture where each pixel identifies the "specular" property of that
 part of the texture, as specified in the texture's red, green, and blue channels
 (in the <a href="H3DU.Math.html#H3DU.Math.colorTosRGB">sRGB color space</a>).<li><a href='#H3DU.PbrMaterial_workflow'>workflow</a><br>Specifies which workflow to use when interpreting values for this
 material.</ul><h3> Methods</h3><ul><li><a href='#H3DU.PbrMaterial_copy'>copy</a><br>Clones this object's parameters to a new <a href="H3DU.PbrMaterial.html">H3DU.PbrMaterial</a>
@@ -91,8 +91,8 @@ <h3> H3DU.PbrMaterial#metalness
 <h3> H3DU.PbrMaterial#metalnessMap
 
 </h3>A texture indicating the metalness of each part of the texture,
-as specified in the texture's red channel.
-Each pixel value in the red channel (which ranges from 0-255 in most image
+as specified in the texture's blue channel.
+Each pixel value in the blue channel (which ranges from 0-255 in most image
 formats) is scaled to the range [0, 1].<p>
 This value is only used in the <b>metallic workflow</b>.
 Any texture used for this map should not be in JPEG format or any other
@@ -141,8 +141,8 @@ <h3> H3DU.PbrMaterial#roughness
 <h3> H3DU.PbrMaterial#roughnessMap
 
 </h3>A texture indicating the roughness of each part of the texture,
-as specified in the texture's red channel.
-Each pixel value in the red channel (which ranges from 0-255 in most image
+as specified in the texture's green channel.
+Each pixel value in the green channel (which ranges from 0-255 in most image
 formats) is scaled to the range [0, 1].<p>
 The inverse of roughness is <i>glossiness</i> or <i>smoothness</i>;
 to treat the texture as a glossiness or smoothness map, set the
diff --git a/dochtml/H3DU.Semantic.html b/dochtml/H3DU.Semantic.html
@@ -44,11 +44,13 @@ <h3> H3DU.Semantic.MODELVIEWPROJECTION (constant)
 <h3> H3DU.Semantic.NORMAL (constant)
 
 </h3>Attribute semantic for a vertex normal.
+The default shader uses 3-dimensional normals.
 
 <a name='H3DU.Semantic.POSITION'></a>
 <h3> H3DU.Semantic.POSITION (constant)
 
 </h3>Attribute semantic for a vertex position.
+The default shader uses 3-dimensional positions.
 
 <a name='H3DU.Semantic.PROJECTION'></a>
 <h3> H3DU.Semantic.PROJECTION (constant)
@@ -63,7 +65,15 @@ <h3> H3DU.Semantic.TANGENT (constant)
 <a name='H3DU.Semantic.TEXCOORD'></a>
 <h3> H3DU.Semantic.TEXCOORD (constant)
 
-</h3>Attribute semantic for a texture coordinate.
+</h3>Attribute semantic for a texture coordinate.<p>
+Note that the default shader supports only 2-dimensional
+texture coordinates. For such texturing tasks as mapping
+a square to a trapezoid, 3-dimensional texture coordinates
+are useful to ensure the texturing is perspective-correct.
+In this case, the 3-D texture coordinates are converted
+to 2-D by dividing the X and Y components by the Z component.
+In a fragment shader, this can look like the following
+code: <code>texCoord.xy/texCoord.z</code>.
 
 <a name='H3DU.Semantic.VIEW'></a>
 <h3> H3DU.Semantic.VIEW (constant)
diff --git a/dochtml/H3DU.TextureLoader.html b/dochtml/H3DU.TextureLoader.html
@@ -5,7 +5,7 @@ <h3> H3DU.TextureLoader()</h3>An object that caches loaded textures and uploads
 stores their texture data.</ul><a name='H3DU.TextureLoader_dispose'></a>
 <h3> H3DU.TextureLoader#dispose()</h3>Disposes all resources used by this texture loader.<h4> Return Value</h4>This method doesn't return a value. (Type: void)<a name='H3DU.TextureLoader_getTexture'></a>
 <h3> H3DU.TextureLoader#getTexture(name)</h3>Gets an already loaded texture by name from this texture loader.<h4> Parameters</h4><ul><li><code>name</code> (Type: string)<br>The name of the texture, usually its file name.</ul><h4> Return Value</h4>The texture with the given name, or null
-if it doesn't exist. (Type: <a href="H3DU.Texture.html">H3DU.Texture</a>)<a name='H3DU.TextureLoader_loadAndMapTexture'></a>
+if it isn't fully loaded or doesn't exist. (Type: <a href="H3DU.Texture.html">H3DU.Texture</a>)<a name='H3DU.TextureLoader_loadAndMapTexture'></a>
 <h3> H3DU.TextureLoader#loadAndMapTexture(texture, context)</h3>Loads the texture referred to in an array of URLs and
 uploads its texture data to a WebGL context.<h4> Parameters</h4><ul><li><code>texture</code> (Type: String | <a href="H3DU.TextureInfo.html">H3DU.TextureInfo</a> | <a href="H3DU.Texture.html">H3DU.Texture</a>)<br>An object described in H3DU.TextureLoader.loadTexture.<li><code>context</code> (Type: WebGLRenderingContext | WebGL2RenderingContext | Object)<br>A WebGL context to associate with this scene, or an object, such as <a href="H3DU.Scene3D.html">H3DU.Scene3D</a>, that implements a no-argument <code>getContext</code> method that returns a WebGL context.</ul><h4> Return Value</h4>A promise that resolves when
 the texture is loaded successfully (the result will be an H3DU.Texture object)
diff --git a/h3du-bufferhelper.js b/h3du-bufferhelper.js
@@ -291,6 +291,8 @@ BufferHelper._wellKnownAttributes = {
   "NORMAL":1,
   "JOINT":4,
   "WEIGHT":5,
+  "JOINTS":4,
+  "WEIGHTS":5,
   "TANGENT":6,
   "BITANGENT":7
 };
diff --git a/h3du-mesh.js b/h3du-mesh.js
@@ -207,7 +207,6 @@ Mesh.prototype.color3 = function(r, g, b) {
   * @returns {H3DU.Mesh} This object.
   */
 Mesh.prototype.texCoord2 = function(u, v) {
-// LATER: Support 3D texture coordinates
   if(typeof u === "number" && typeof v === "number") {
     this.texCoord[0] = u;
     this.texCoord[1] = v;
diff --git a/h3du-pbrmaterial.js b/h3du-pbrmaterial.js
@@ -66,8 +66,8 @@ function PbrMaterial(params) {
   this.metalness = 0;
   /**
    * A texture indicating the metalness of each part of the texture,
-   * as specified in the texture's red channel.
-   * Each pixel value in the red channel (which ranges from 0-255 in most image
+   * as specified in the texture's blue channel.
+   * Each pixel value in the blue channel (which ranges from 0-255 in most image
    * formats) is scaled to the range [0, 1].<p>
    * This value is only used in the <b>metallic workflow</b>.
    * Any texture used for this map should not be in JPEG format or any other
@@ -88,8 +88,8 @@ function PbrMaterial(params) {
   this.roughness = 0.35;
   /**
    * A texture indicating the roughness of each part of the texture,
-   * as specified in the texture's red channel.
-   * Each pixel value in the red channel (which ranges from 0-255 in most image
+   * as specified in the texture's green channel.
+   * Each pixel value in the green channel (which ranges from 0-255 in most image
    * formats) is scaled to the range [0, 1].<p>
    * The inverse of roughness is <i>glossiness</i> or <i>smoothness</i>;
    * to treat the texture as a glossiness or smoothness map, set the
diff --git a/h3du-semantic.js b/h3du-semantic.js
@@ -14,16 +14,26 @@
  */
 export var Semantic = {};
 /** Attribute semantic for a vertex position.
+ * The default shader uses 3-dimensional positions.
  * @const
  * @static
  */
 Semantic.POSITION = 0;
 /** Attribute semantic for a vertex normal.
+ * The default shader uses 3-dimensional normals.
  * @const
  * @static
  */
 Semantic.NORMAL = 1;
-/** Attribute semantic for a texture coordinate.
+/** Attribute semantic for a texture coordinate.<p>
+ * Note that the default shader supports only 2-dimensional
+ * texture coordinates. For such texturing tasks as mapping
+ * a square to a trapezoid, 3-dimensional texture coordinates
+ * are useful to ensure the texturing is perspective-correct.
+ * In this case, the 3-D texture coordinates are converted
+ * to 2-D by dividing the X and Y components by the Z component.
+ * In a fragment shader, this can look like the following
+ * code: <code>texCoord.xy/texCoord.z</code>.
  * @const
  * @static
  */
diff --git a/h3du-shaderinfo.js b/h3du-shaderinfo.js
@@ -690,10 +690,10 @@ ShaderInfo.getDefaultFragment = function() {
 // Convert Blinn-Phong shininess to roughness
 // See http://simonstechblog.blogspot.ca/2011/12/microfacet-brdf.html
     "#ifndef ROUGHNESS", "#ifdef SPECULAR", "rough=clamp(sqrt(2.0/(2.0+mshin)),0.0,1.0);", "#endif", "#endif",
-    "#ifdef ROUGHNESS_MAP", "rough=texture2D(roughnessMap,uvVar).r;", "#endif",
+    "#ifdef ROUGHNESS_MAP", "rough=texture2D(roughnessMap,uvVar).g;", "#endif",
     "#ifdef INVERT_ROUGHNESS", "rough=1.0-rough;", "#endif",
     "#ifdef METALNESS", "metal=metalness;", "#endif",
-    "#ifdef METALNESS_MAP", "metal=texture2D(metalnessMap,uvVar).r;", "#endif",
+    "#ifdef METALNESS_MAP", "metal=texture2D(metalnessMap,uvVar).b;", "#endif",
     "#endif", // PHYSICAL_BASED
     ""].join("\n") + "\n";
   for(i = 0; i < H3DU.Lights.MAX_LIGHTS; i++) {
diff --git a/h3du-texture.js b/h3du-texture.js
@@ -93,21 +93,31 @@ Texture.prototype.setClamp = function(clamp) {
  */
 Texture.loadTexture = function(info, textureCache) {
  // Get cached texture
-
   var texImage;
   var name;
   if(!(typeof info !== "undefined" && info !== null)) {
     throw new Error();
   }
   if(info instanceof H3DU.Texture) {
     name = info.name;
-    texImage = info;
   } else {
     name = info instanceof H3DU.TextureInfo ? info.uri : info;
-    if(textureCache && textureCache[name] && name && name.length > 0) {
+  }
+  if(textureCache && textureCache[name] && name && name.length > 0) {
+    if(textureCache[name].loadStatus === 2) {
+  // Already loaded
       return Promise.resolve(textureCache[name]);
+    } else {
+  // Already present in the cache
+      texImage = textureCache[name];
+    }
+  } else {
+      // New texture not yet cached
+    if(info instanceof H3DU.Texture) {
+      texImage = info;
+    } else {
+      texImage = new H3DU.Texture(name);
     }
-    texImage = new H3DU.Texture(name);
   }
   if(textureCache && name && name.length > 0) {
     textureCache[name] = texImage;
@@ -220,8 +230,17 @@ Texture.prototype.loadImage = function() {
     return Promise.resolve(this);
   }
   var that = this;
+  if(this.loadStatus === 1) {
+    // Already loading
+    return new Promise(function(res) {
+      setTimeout(function() {
+        res(that.loadImage());
+      }, 5);
+    });
+  }
   var thisName = this.name;
   that.loadStatus = 1;
+  // console.log("loading: "+this.name)
  // Use the TGA image loader if it has the TGA file
  // extension
   if((/\.tga$/i).test(thisName)) {
@@ -247,7 +266,7 @@ Texture.prototype.loadImage = function() {
       that.width = target.width;
       that.height = target.height;
       that.loadStatus = 2;
-   // console.log("loaded: "+thisName)
+      // console.log("loaded: "+thisName)
       image.onload = null;
       image.onerror = null;
       resolve(that);
diff --git a/h3du-textureinfo.js b/h3du-textureinfo.js
@@ -31,7 +31,7 @@ export var TextureInfo = function(params) {
   this.target = 3553;
   this.type = 5121;
   this.magFilter = 9729;
-  this.minFilter = 9987; // NOTE: Different from glTF default of 9986
+  this.minFilter = 9987; // NOTE: Different from glTF 1.0 default of 9986
   this.wrapS = 10497;
   this.wrapT = 10497;
   this.setParams(typeof params === "undefined" ? null : params);
diff --git a/h3du-textureloader.js b/h3du-textureloader.js
@@ -27,12 +27,11 @@ export var TextureLoader = function() {
  * Gets an already loaded texture by name from this texture loader.
  * @param {string} name The name of the texture, usually its file name.
  * @returns {H3DU.Texture} The texture with the given name, or null
- * if it doesn't exist.
+ * if it isn't fully loaded or doesn't exist.
  */
 TextureLoader.prototype.getTexture = function(name) {
   var tex = this.textureImages[name] || null;
   if(tex && tex.loadStatus !== 2) {
-    this.textureImages[name] = null;
     return null;
   }
   return this.textureImages[name] || null;
diff --git a/h3du_min.js b/h3du_min.js
