small refinements

phoenixbf · Aug 23, 2021 · 6319c33 · 6319c33
1 parent 2b508cd
commit 6319c33
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/public/dist/ATON.min.js b/public/dist/ATON.min.js
diff --git a/public/dist/ATON.min.js.map b/public/dist/ATON.min.js.map
diff --git a/public/examples/pbr-basic-shadow/index.html b/public/examples/pbr-basic-shadow/index.html
@@ -23,8 +23,7 @@
 	<script type="text/javascript" src="/vendors/vendors.min.js"></script>
 
     <script type="text/javascript" src="/dist/THREE.bundle.js"></script>
-    <script type="text/javascript" src="/dist/ATON.min.js"></script>
-
+    <script type="module" src="/src/ATON.js"></script>
 <script>
 window.addEventListener( 'load', ()=>{
 

diff --git a/public/hathor/hathor.js b/public/hathor/hathor.js
@@ -1523,7 +1523,7 @@ HATHOR.popupEnvironment = ()=>{
             ATON.VRoadcast.fireEvent("AFE_LightSwitch", false);
         }
 
-        console.log(E);
+        //console.log(E);
 
         ATON.toggleMainLight(b);
     });

diff --git a/public/src/ATON.js b/public/src/ATON.js
@@ -954,6 +954,7 @@ ATON._postAllReqsCompleted = (R)=>{
         if (N && N.toggle){
             ATON._postAllReqsCompleted(N);
             N.toggle(N.visible);
+
             //if (N.bPickable !== undefined) N.setPickable(N.bPickable);
         }
     }
@@ -1359,10 +1360,10 @@ ATON.adjustShadowsParamsFromSceneBounds = ()=>{
 
     //ATON._dMainL.shadow.camera.updateProjectionMatrix();
 
-    let shb = -(r / 5000.0);
-    if (shb < -0.0005) shb = -0.0005;
-
+    let shb = -(r * 0.0002);
+    if (shb < -0.001) shb = -0.001; // -0.0005
     ATON._dMainL.shadow.bias = shb;
+
     //ATON._dMainL.shadow.normalBias = 0.05;
     //ATON._dMainL.shadow.radius = 8;
 };

diff --git a/public/src/ATON.node.js b/public/src/ATON.node.js
@@ -651,7 +651,8 @@ load(url, onComplete){
             ATON.Utils.ccExtract(data);
 
             resolve(model);
-            console.log("Model "+url+" loaded");
+            //console.log("Model "+url+" loaded");
+            console.log("Model loaded");
 
             /*if (N.type === ATON.NTYPES.SCENE)*/ ATON._assetReqComplete(url);
 
@@ -671,6 +672,7 @@ load(url, onComplete){
         (err)=>{
             //console.log(err);
             //reject(model);
+            console.log("Error loading model");
 
             /*if (N.type === ATON.NTYPES.SCENE)*/ ATON._assetReqComplete(url);
             if (onComplete) onComplete();

diff --git a/public/src/ATON.utils.js b/public/src/ATON.utils.js
@@ -373,13 +373,14 @@ Utils.loadTileSet = (tsurl, N)=>{
 };
 
 // Helper visitor routine
-// Note: parentNode is not connected to model
-Utils.modelVisitor = (parentNode, model)=>{
-    if (!model) return this;
+// Note: N (parent node) is not yet connected to model
+Utils.modelVisitor = (N, model)=>{
+    if (model===undefined) return this;
+    if (N===undefined) return this;
 
     //model = Utils.mergeObject(model);
 
-    let N = parentNode;
+    //let N = parentNode;
     let type = N.type; // Differentiate visit depending on node type
 
     model.traverse( ( o ) => {