@jscad/regl-renderer 2.3.0 → 2.4.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/regl-renderer@2.3.0...@jscad/regl-renderer@2.4.0) (2021-09-27)
+
+
+### Features
+
+* **regl-renderer:** enhanced rendering to use the matrix as provided with the geometry ([#871](https://github.com/jscad/OpenJSCAD.org/issues/871)) ([40802af](https://github.com/jscad/OpenJSCAD.org/commit/40802afeb9a2a45cf3eb4f1b9dc774b8670d8259))
+
+
+
+
+
 # [2.3.0](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/regl-renderer@2.2.0...@jscad/regl-renderer@2.3.0) (2021-09-09)
 
 

package/dist/jscad-regl-renderer.min.js

@@ -311,13 +311,13 @@ const mat4=require("gl-mat4"),{meshColor:meshColor}=require("../../renderDefault
 const meshFrag="\nprecision mediump float;\nvarying vec3 surfaceNormal;\nuniform float ambientLightAmount;\nuniform float diffuseLightAmount;\nuniform vec4 ucolor;\nuniform vec3 lightDirection;\nuniform vec3 opacity;\n\nvarying vec4 _worldSpacePosition;\n\nuniform vec2 printableArea;\n\nvec4 errorColor = vec4(0.15, 0.15, 0.15, 0.3);\n\nvoid main () {\n  vec4 depth = gl_FragCoord;\n\n  float v = 0.8; // shadow value\n  vec4 endColor = ucolor;\n\n  vec3 ambient = ambientLightAmount * endColor.rgb;\n  float cosTheta = dot(surfaceNormal, lightDirection);\n  vec3 diffuse = diffuseLightAmount * endColor.rgb * clamp(cosTheta , 0.0, 1.0 );\n\n  float cosTheta2 = dot(surfaceNormal, vec3(-lightDirection.x, -lightDirection.y, lightDirection.z));\n  vec3 diffuse2 = diffuseLightAmount * endColor.rgb * clamp(cosTheta2 , 0.0, 1.0 );\n\n  gl_FragColor = vec4((ambient + diffuse + diffuse2 * v), endColor.a);\n}",meshVert="\nprecision mediump float;\n\nuniform float camNear, camFar;\nuniform mat4 model, view, projection;\n\nattribute vec3 position, normal;\n\nvarying vec3 surfaceNormal, surfacePosition;\nvarying vec4 _worldSpacePosition;\n\nvoid main() {\n  surfacePosition = position;\n  surfaceNormal = normal;\n  vec4 worldSpacePosition = model * vec4(position, 1);\n  _worldSpacePosition = worldSpacePosition;\n\n  vec4 glPosition = projection * view * model * vec4(position, 1);\n  gl_Position = glPosition;\n}\n";module.exports={vert:meshVert,frag:meshFrag};
 
 },{}],105:[function(require,module,exports){
-const mat4=require("gl-mat4"),{meshColor:meshColor}=require("../../renderDefaults"),drawMesh=(e,r={extras:{}})=>{const t={useVertexColors:!0,dynamicCulling:!1,geometry:void 0,color:meshColor};let{geometry:s,dynamicCulling:a,useVertexColors:o,color:l}=Object.assign({},t,r);const n=e.buffer([]),i=!!(s.indices&&s.indices.length>0),c=!!(s.normals&&s.normals.length>0),m=!!(o&&s.colors&&s.colors.length>0),u=a?(e,r)=>{return 1&[r.model[0],r.model[5],r.model[10]].filter(e=>e<0).length?"front":"back"}:"back";let d={primitive:"triangles",vert:m?require("./vColorShaders").vert:require("./meshShaders").vert,frag:m?require("./vColorShaders").frag:require("./meshShaders").frag,uniforms:{model:(e,r)=>r.model||s.transforms||mat4.create(),ucolor:(e,r)=>r&&r.color?r.color:l,vColorToggler:(e,r)=>r&&r.useVertexColors&&!0===r.useVertexColors?1:0,unormal:(e,r)=>{const t=mat4.create(),s=mat4.multiply(mat4.create(),t,r.camera.view),a=mat4.create();return mat4.invert(a,s),mat4.transpose(a,a),a}},attributes:{position:e.buffer({usage:"static",type:"float",data:s.positions}),ao:n},cull:{enable:!0,face:u},depth:{enable:!0},blend:{enable:!0,func:{src:"src alpha",dst:"one minus src alpha"}}};return s.cells?d.elements=s.cells:i?d.elements=e.elements({usage:"static",type:"uint16",data:s.indices}):s.triangles?d.elements=s.triangles:d.count=s.positions.length/3,c&&(d.attributes.normal=e.buffer({usage:"static",type:"float",data:s.normals})),m&&(d.attributes.color=e.buffer({usage:"static",type:"float",data:s.colors})),e(d=Object.assign({},d,r.extras))};module.exports=drawMesh;
+const mat4=require("gl-mat4"),{meshColor:meshColor}=require("../../renderDefaults"),drawMesh=(e,r={extras:{}})=>{const t={useVertexColors:!0,dynamicCulling:!0,geometry:void 0,color:meshColor},{geometry:a,dynamicCulling:s,useVertexColors:o,color:l}=Object.assign({},t,r),n=e.buffer([]),i=!!(a.indices&&a.indices.length>0),c=!!(a.normals&&a.normals.length>0),m=!!(o&&a.colors&&a.colors.length>0),u=a.transforms||mat4.create(),d=mat4.determinant(u)<0,g=s&&d?"front":"back",f=m?require("./vColorShaders").vert:require("./meshShaders").vert,h=m?require("./vColorShaders").frag:require("./meshShaders").frag,b=mat4.invert(mat4.create(),u);let p={primitive:"triangles",vert:f,frag:h,uniforms:{model:(e,r)=>u,ucolor:(e,r)=>r&&r.color?r.color:l,vColorToggler:(e,r)=>r&&r.useVertexColors&&!0===r.useVertexColors?1:0,unormal:(e,r)=>{const t=mat4.invert(mat4.create(),r.camera.view);return mat4.multiply(t,b,t),mat4.transpose(t,t),t}},attributes:{position:e.buffer({usage:"static",type:"float",data:a.positions}),ao:n},cull:{enable:!0,face:g},depth:{enable:!0},blend:{enable:!0,func:{src:"src alpha",dst:"one minus src alpha"}}};return a.cells?p.elements=a.cells:i?p.elements=e.elements({usage:"static",type:"uint16",data:a.indices}):a.triangles?p.elements=a.triangles:p.count=a.positions.length/3,c&&(p.attributes.normal=e.buffer({usage:"static",type:"float",data:a.normals})),m&&(p.attributes.color=e.buffer({usage:"static",type:"float",data:a.colors})),e(p=Object.assign({},p,r.extras))};module.exports=drawMesh;
 
 },{"../../renderDefaults":110,"./meshShaders":106,"./vColorShaders":107,"gl-mat4":26}],106:[function(require,module,exports){
 const meshFrag="\nprecision mediump float;\nvarying vec3 surfaceNormal;\nuniform float ambientLightAmount;\nuniform float diffuseLightAmount;\nuniform vec4 ucolor;\nuniform vec3 lightDirection;\nuniform vec3 opacity;\n\nvarying vec4 _worldSpacePosition;\n\nuniform vec2 printableArea;\n\nvec4 errorColor = vec4(0.15, 0.15, 0.15, 0.3);\n\nvoid main () {\n  vec4 depth = gl_FragCoord;\n\n  float v = 0.8; // shadow value\n  vec4 endColor = ucolor;\n\n  vec3 ambient = ambientLightAmount * endColor.rgb;\n  float cosTheta = dot(surfaceNormal, lightDirection);\n  vec3 diffuse = diffuseLightAmount * endColor.rgb * clamp(cosTheta , 0.0, 1.0 );\n\n  float cosTheta2 = dot(surfaceNormal, vec3(-lightDirection.x, -lightDirection.y, lightDirection.z));\n  vec3 diffuse2 = diffuseLightAmount * endColor.rgb * clamp(cosTheta2 , 0.0, 1.0 );\n\n  gl_FragColor = vec4((ambient + diffuse + diffuse2 * v), endColor.a);\n}",meshVert="\nprecision mediump float;\n\nuniform float camNear, camFar;\nuniform mat4 model, view, projection;\n\nattribute vec3 position, normal;\n\nvarying vec3 surfaceNormal, surfacePosition;\nvarying vec4 _worldSpacePosition;\n\nvoid main() {\n  surfacePosition = position;\n  surfaceNormal = normal;\n  vec4 worldSpacePosition = model * vec4(position, 1);\n  _worldSpacePosition = worldSpacePosition;\n\n  vec4 glPosition = projection * view * model * vec4(position, 1);\n  gl_Position = glPosition;\n}\n";module.exports={vert:meshVert,frag:meshFrag};
 
 },{}],107:[function(require,module,exports){
-const vColorVert="\nprecision mediump float;\n\nuniform float camNear, camFar;\nuniform mat4 model, view, projection, unormal;\n\nattribute vec3 position, normal;\nattribute vec4 color;\n\nattribute float ao;\nvarying float ambientAo;\n\nvarying vec3 surfaceNormal, surfacePosition;\nvarying vec4 _worldSpacePosition;\nvarying vec4 vColor;\n\nvoid main() {\n  surfacePosition = position;\n  surfaceNormal = (unormal * vec4(normal, 1.0)).xyz; //vec4 transformedNormal = uNormalMatrix * vec4(aVertexNormal, 1.0);\n  vec4 worldSpacePosition = model * vec4(position, 1);\n  _worldSpacePosition = worldSpacePosition;\n  //gl_Position = projection * view * worldSpacePosition;\n\n  vColor = color;\n\n  //ambientAo = (1. - ao) * (0.5 * max(normal.x, 0.) + 0.5);\n\n  vec4 glPosition = projection * view * model * vec4(position, 1);\n  gl_Position = glPosition;\n  //gl_Position = zBufferAdjust(glPosition, camNear, camFar);\n}\n",vColorFrag="\nprecision mediump float;\nvarying vec3 surfaceNormal, surfacePosition;\n\nuniform float ambientLightAmount;\nuniform float diffuseLightAmount;\nuniform float specularLightAmount;\n\nuniform vec3 lightDirection;\nuniform vec4 lightColor;\nuniform vec3 opacity;\nuniform float uMaterialShininess;\n\nvarying vec4 vColor;\nuniform vec4 ucolor;\nuniform float vColorToggler;\n\nuniform vec2 printableArea;\nvec4 errorColor = vec4(0.15, 0.15, 0.15, 0.3);//vec4(0.15, 0.15, 0.15, 0.3);\nvarying vec4 _worldSpacePosition;\nvarying float ambientAo;\n\nvoid main () {\n  vec4 depth = gl_FragCoord;\n  vec4 endColor = vColor * vColorToggler + ucolor * (1.0 - vColorToggler);\n\n  vec3 ambient = ambientLightAmount * endColor.rgb ; //ambientAo * \n\n  float diffuseWeight = dot(surfaceNormal, lightDirection);\n  vec3 diffuse = diffuseLightAmount * endColor.rgb * clamp(diffuseWeight , 0.0, 1.0 );\n\n  //specular\n  \n  vec4 specularColor = vec4(lightColor);\n  vec3 eyeDirection = normalize(surfacePosition.xyz);\n  vec3 reflectionDirection = reflect(-lightDirection, surfaceNormal);\n  float specularLightWeight = pow(max(dot(reflectionDirection, eyeDirection), 0.0), uMaterialShininess);\n  vec3 specular = specularColor.rgb * specularLightWeight * specularLightAmount;\n\n  /*float light2Multiplier = 0.2;\n  float diffuseWeight2 = dot(surfaceNormal, vec3(-lightDirection.x, lightDirection.y, lightDirection.z));\n  vec3 diffuse2 = diffuseLightAmount * endColor.rgb * clamp(diffuseWeight2 , 0.0, 1.0 ) * light2Multiplier;\n\n  float light3Multiplier = 0.2;  \n  float diffuseWeight3 = dot(surfaceNormal, vec3(lightDirection.x, -lightDirection.y, lightDirection.z));\n  vec3 diffuse3 = diffuseLightAmount * endColor.rgb * clamp(diffuseWeight3 , 0.0, 1.0 ) * light3Multiplier;\n\n  float light4Multiplier = 0.2;  \n  float diffuseWeight4 = dot(surfaceNormal, vec3(-lightDirection.x, -lightDirection.y, lightDirection.z));\n  vec3 diffuse4 = diffuseLightAmount * endColor.rgb * clamp(diffuseWeight4 , 0.0, 1.0 ) * light4Multiplier;*/\n  \n  gl_FragColor = vec4((ambient + diffuse + specular), endColor.a);\n  //gl_FragColor = vec4((ambient + diffuse + diffuse2 + diffuse3 + diffuse4), endColor.a);\n}\n";module.exports={frag:vColorFrag,vert:vColorVert};
+const vColorVert="\nprecision mediump float;\n\nuniform float camNear, camFar;\nuniform mat4 model, view, projection, unormal;\n\nattribute vec3 position, normal;\nattribute vec4 color;\n\nattribute float ao;\nvarying float ambientAo;\n\nvarying vec3 surfaceNormal, surfacePosition;\nvarying vec4 _worldSpacePosition;\nvarying vec4 vColor;\n\nvoid main() {\n  surfacePosition = (unormal * vec4(position, 1.0)).xyz;\n  surfaceNormal = (unormal * vec4(normal, 1.0)).xyz; //vec4 transformedNormal = uNormalMatrix * vec4(aVertexNormal, 1.0);\n  vec4 worldSpacePosition = model * vec4(position, 1);\n  _worldSpacePosition = worldSpacePosition;\n  //gl_Position = projection * view * worldSpacePosition;\n\n  vColor = color;\n\n  //ambientAo = (1. - ao) * (0.5 * max(normal.x, 0.) + 0.5);\n\n  vec4 glPosition = projection * view * model * vec4(position, 1);\n  gl_Position = glPosition;\n  //gl_Position = zBufferAdjust(glPosition, camNear, camFar);\n}\n",vColorFrag="\nprecision mediump float;\nvarying vec3 surfaceNormal, surfacePosition;\n\nuniform float ambientLightAmount;\nuniform float diffuseLightAmount;\nuniform float specularLightAmount;\n\nuniform vec3 lightDirection;\nuniform vec4 lightColor;\nuniform vec3 opacity;\nuniform float uMaterialShininess;\n\nvarying vec4 vColor;\nuniform vec4 ucolor;\nuniform float vColorToggler;\n\nuniform vec2 printableArea;\nvec4 errorColor = vec4(0.15, 0.15, 0.15, 0.3);//vec4(0.15, 0.15, 0.15, 0.3);\nvarying vec4 _worldSpacePosition;\nvarying float ambientAo;\n\nvoid main () {\n  vec4 depth = gl_FragCoord;\n  vec4 endColor = vColor * vColorToggler + ucolor * (1.0 - vColorToggler);\n\n  vec3 ambient = ambientLightAmount * endColor.rgb ; //ambientAo * \n\n  float diffuseWeight = dot(surfaceNormal, lightDirection);\n  vec3 diffuse = diffuseLightAmount * endColor.rgb * clamp(diffuseWeight , 0.0, 1.0 );\n\n  //specular\n  \n  vec4 specularColor = vec4(lightColor);\n  vec3 eyeDirection = normalize(surfacePosition.xyz);\n  vec3 reflectionDirection = reflect(-lightDirection, -surfaceNormal);\n  float specularLightWeight = pow(max(dot(reflectionDirection, eyeDirection), 0.0), uMaterialShininess);\n  vec3 specular = specularColor.rgb * specularLightWeight * specularLightAmount;\n\n  /*float light2Multiplier = 0.2;\n  float diffuseWeight2 = dot(surfaceNormal, vec3(-lightDirection.x, lightDirection.y, lightDirection.z));\n  vec3 diffuse2 = diffuseLightAmount * endColor.rgb * clamp(diffuseWeight2 , 0.0, 1.0 ) * light2Multiplier;\n\n  float light3Multiplier = 0.2;  \n  float diffuseWeight3 = dot(surfaceNormal, vec3(lightDirection.x, -lightDirection.y, lightDirection.z));\n  vec3 diffuse3 = diffuseLightAmount * endColor.rgb * clamp(diffuseWeight3 , 0.0, 1.0 ) * light3Multiplier;\n\n  float light4Multiplier = 0.2;  \n  float diffuseWeight4 = dot(surfaceNormal, vec3(-lightDirection.x, -lightDirection.y, lightDirection.z));\n  vec3 diffuse4 = diffuseLightAmount * endColor.rgb * clamp(diffuseWeight4 , 0.0, 1.0 ) * light4Multiplier;*/\n  \n  gl_FragColor = vec4((ambient + diffuse + specular), endColor.a);\n  //gl_FragColor = vec4((ambient + diffuse + diffuse2 + diffuse3 + diffuse4), endColor.a);\n}\n";module.exports={frag:vColorFrag,vert:vColorVert};
 
 },{}],108:[function(require,module,exports){
 const renderContext=require("./renderContext"),renderDefaults=require("./renderDefaults"),prepareRender=e=>{const r=Object.assign({},{},e.glOptions,{onDone:(e,r)=>{if(e)throw e}}),n=require("regl")(r),a=new Map;return function(e){var r;n.poll(),(r=e).rendering=Object.assign({},renderDefaults,r.rendering),renderContext(n)(r,e=>{n.clear({color:r.rendering.background,depth:1}),r.entities&&r.entities.sort((e,r)=>{const n="transparent"in e.visuals&&e.visuals.transparent;return n===("transparent"in r.visuals&&r.visuals.transparent)?0:n?1:-1}).forEach(e=>{const{visuals:t}=e;if((!("show"in t)||t.show)&&t.drawCmd&&r.drawCommands[t.drawCmd]){let s;t.cacheId?s=a.get(t.cacheId):(t.cacheId=a.size,s=r.drawCommands[t.drawCmd](n,e),a.set(t.cacheId,s)),s({...e,...t,camera:r.camera})}})})}};module.exports=prepareRender;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/regl-renderer",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Renderer for JSCAD Geometries",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
   "main": "src/index.js",
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@jscad/img-utils": "2.0.1",
-    "@jscad/modeling": "2.5.1",
+    "@jscad/modeling": "2.5.2",
     "ava": "3.15.0",
     "browserify": "16.5.1",
     "budo": "11.6.4",
@@ -43,5 +43,5 @@
     "typescript": "^4.0.0",
     "uglifyify": "5.0.2"
   },
-  "gitHead": "2b5a4ed416c7ea9479e861fe2f968acec92e23b3"
+  "gitHead": "a761f641bb2ac6016dc4a02ef86ce279dd553d7c"
 }

package/src/rendering/commands/drawMesh/index.js

@@ -5,11 +5,11 @@ const { meshColor } = require('../../renderDefaults')
 const drawMesh = (regl, params = { extras: {} }) => {
   const defaults = {
     useVertexColors: true,
-    dynamicCulling: false,
+    dynamicCulling: true,
     geometry: undefined,
     color: meshColor
   }
-  let { geometry, dynamicCulling, useVertexColors, color } = Object.assign({}, defaults, params)
+  const { geometry, dynamicCulling, useVertexColors, color } = Object.assign({}, defaults, params)
 
   // let ambientOcclusion = vao(geometry.indices, geometry.positions, 64, 64)
   const ambientOcclusion = regl.buffer([])
@@ -18,15 +18,15 @@ const drawMesh = (regl, params = { extras: {} }) => {
   const hasIndices = !!(geometry.indices && geometry.indices.length > 0)
   const hasNormals = !!(geometry.normals && geometry.normals.length > 0)
   const hasVertexColors = !!(useVertexColors && geometry.colors && geometry.colors.length > 0)
+  const transforms = geometry.transforms || mat4.create()
+  const flip = mat4.determinant(transforms) < 0
   const cullFace = dynamicCulling
-    ? (context, props) => {
-        const isOdd = ([props.model[0], props.model[5], props.model[10]].filter((x) => x < 0).length) & 1 // count the number of negative components & deterine if that is odd or even
-        return isOdd ? 'front' : 'back'
-      }
+    ? (flip ? 'front' : 'back')
     : 'back'
 
   const vert = hasVertexColors ? require('./vColorShaders').vert : require('./meshShaders').vert
-  let frag = hasVertexColors ? require('./vColorShaders').frag : require('./meshShaders').frag
+  const frag = hasVertexColors ? require('./vColorShaders').frag : require('./meshShaders').frag
+  const modelMatrixInv = mat4.invert(mat4.create(), transforms)
 
   // console.log('type', geometry.type, 'color', color, hasVertexColors)
 
@@ -36,18 +36,16 @@ const drawMesh = (regl, params = { extras: {} }) => {
     frag,
 
     uniforms: {
-      model: (context, props) => props.model || geometry.transforms || mat4.create(),
+      model: (context, props) => transforms ,
       ucolor: (context, props) => (props && props.color) ? props.color : color,
-      // semi hack, woraround to enable/disable vertex colors!!!
+      // semi hack, woraround to enable/disable vertex colors !!!
       vColorToggler: (context, props) => (props && props.useVertexColors && props.useVertexColors === true) ? 1.0 : 0.0,
       // experimental
       unormal: (context, props) => {
-        const model = mat4.create()
-        const modelViewMatrix = mat4.multiply(mat4.create(), model, props.camera.view)
-        const normalMatrix = mat4.create()
-        mat4.invert(normalMatrix, modelViewMatrix)
-        mat4.transpose(normalMatrix, normalMatrix)
-        return normalMatrix
+        const modelViewMatrix = mat4.invert(mat4.create(), props.camera.view)
+        mat4.multiply(modelViewMatrix, modelMatrixInv, modelViewMatrix)
+        mat4.transpose(modelViewMatrix, modelViewMatrix)
+        return modelViewMatrix
       }
     },
     attributes: {

package/src/rendering/commands/drawMesh/vColorShaders.js

@@ -15,7 +15,7 @@ varying vec4 _worldSpacePosition;
 varying vec4 vColor;
 
 void main() {
-  surfacePosition = position;
+  surfacePosition = (unormal * vec4(position, 1.0)).xyz;
   surfaceNormal = (unormal * vec4(normal, 1.0)).xyz; //vec4 transformedNormal = uNormalMatrix * vec4(aVertexNormal, 1.0);
   vec4 worldSpacePosition = model * vec4(position, 1);
   _worldSpacePosition = worldSpacePosition;
@@ -65,7 +65,7 @@ void main () {
   
   vec4 specularColor = vec4(lightColor);
   vec3 eyeDirection = normalize(surfacePosition.xyz);
-  vec3 reflectionDirection = reflect(-lightDirection, surfaceNormal);
+  vec3 reflectionDirection = reflect(-lightDirection, -surfaceNormal);
   float specularLightWeight = pow(max(dot(reflectionDirection, eyeDirection), 0.0), uMaterialShininess);
   vec3 specular = specularColor.rgb * specularLightWeight * specularLightAmount;