Merge pull request #516 from jf-kelly/dev

Grid is transparent and added y-axis
engaging-computing · Jan 13, 2022 · f87b4e0 · f87b4e0
2 parents 47dc0c7 + 36dbc98
commit f87b4e0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/img/grid_alpha_0.png b/img/grid_alpha_0.png
diff --git a/src/components/structural/View.js b/src/components/structural/View.js
@@ -284,6 +284,7 @@ class View extends Component {
                     <a-grid height="53.33" width="53.33" position="-0.5 -0.26 -0.5" scale="1.5 1.5 1.5" gridmaterial/>
                     <a-tube path="-35 -0.2 0, 35 -0.2 0" radius="0.05" material="color: red" basicmaterial></a-tube>
                     <a-tube path="0 -0.2 -35, 0 -0.2 35" radius="0.05" material="color: blue" basicmaterial></a-tube>
+                    <a-tube path="0 -35 0, 0 35 0" radius="0.05" material="color: green" basicmaterial></a-tube>
                     <a-text
                         color="#555"
                         rotation="0 0 0"
@@ -301,7 +302,7 @@ class View extends Component {
                     <a-text
                         color="#555"
                         rotation="0 90 90"
-                        position="0 .1 0"
+                        position=".1 .1 0"
                         side="double"
                         value=" Y + "></a-text>
                 </Fragment>

diff --git a/src/reducers/scene.js b/src/reducers/scene.js
@@ -5,7 +5,7 @@ export const DEF_SETTINGS = {
     floorColor: "#222",
     camConfig: 0,
     showCoordHelper: true,
-    showFloor: false,
+    showFloor: true,
     cameraPosition: "0 1.6 3",
     viewOnly: false,
     defaultLight: true,

diff --git a/src/tests/App.test.js b/src/tests/App.test.js
@@ -317,7 +317,7 @@ describe("Scene Reducer", () => {
                 floorColor: "#222",
                 camConfig: 0,
                 showCoordHelper: true,
-                showFloor: false,
+                showFloor: true,
                 cameraPosition: "0 1.6 3",
                 viewOnly: false,
                 defaultLight: true,

diff --git a/src/utils/AFramePhysics.js b/src/utils/AFramePhysics.js
@@ -46,13 +46,14 @@ AFRAME.registerComponent("gridmaterial",{
         default:""
     },
     init: function(){
-        const texture = new THREE.TextureLoader().load("https://cdn.jsdelivr.net/gh/donmccurdy/[email protected]/assets/grid.png");
+        const texture = new THREE.TextureLoader().load("/img/grid_alpha_0.png");
         texture.repeat = new THREE.Vector2(75,75);
         texture.wrapS = THREE.RepeatWrapping;
         texture.wrapT = THREE.RepeatWrapping;
 
         this.el.getObject3D("mesh").material = new THREE.MeshBasicMaterial({
-            map: texture
+            map: texture,
+            transparent: true
         });
     }
 });