diff --git a/3d_scenery/arrow.glb b/3d_scenery/arrow.glb index 46d4f93..ecc20f5 100644 Binary files a/3d_scenery/arrow.glb and b/3d_scenery/arrow.glb differ diff --git a/3d_scenery/blockstack.glb b/3d_scenery/blockstack.glb deleted file mode 100644 index 95bd3fb..0000000 Binary files a/3d_scenery/blockstack.glb and /dev/null differ diff --git a/3d_scenery/coffee_guy.glb b/3d_scenery/coffee_guy.glb deleted file mode 100644 index 6704b5c..0000000 Binary files a/3d_scenery/coffee_guy.glb and /dev/null differ diff --git a/3d_scenery/museum_hall.glb b/3d_scenery/museum_hall.glb index af640df..9e90d73 100644 Binary files a/3d_scenery/museum_hall.glb and b/3d_scenery/museum_hall.glb differ diff --git a/3d_scenery/museum_hall_painting1.glb b/3d_scenery/museum_hall_painting1.glb index a346cbc..eed8aa8 100644 Binary files a/3d_scenery/museum_hall_painting1.glb and b/3d_scenery/museum_hall_painting1.glb differ diff --git a/3d_scenery/museum_hall_painting2.glb b/3d_scenery/museum_hall_painting2.glb index ae68370..5cbc135 100644 Binary files a/3d_scenery/museum_hall_painting2.glb and b/3d_scenery/museum_hall_painting2.glb differ diff --git a/3d_scenery/museum_hall_painting3.glb b/3d_scenery/museum_hall_painting3.glb index e3398af..39a0d25 100644 Binary files a/3d_scenery/museum_hall_painting3.glb and b/3d_scenery/museum_hall_painting3.glb differ diff --git a/3d_scenery/museum_hall_painting4.glb b/3d_scenery/museum_hall_painting4.glb index cd15816..2f3ad50 100644 Binary files a/3d_scenery/museum_hall_painting4.glb and b/3d_scenery/museum_hall_painting4.glb differ diff --git a/3d_scenery/room1_table.glb b/3d_scenery/room1_table.glb new file mode 100644 index 0000000..168f5b6 Binary files /dev/null and b/3d_scenery/room1_table.glb differ diff --git a/3d_scenery/vase.glb b/3d_scenery/vase.glb new file mode 100644 index 0000000..2820822 Binary files /dev/null and b/3d_scenery/vase.glb differ diff --git a/main.js b/main.js index 0d836bc..53b5c8a 100644 --- a/main.js +++ b/main.js @@ -198,9 +198,9 @@ function addToScene(sceneName, par = {}) { child.name = par.rename child.frustumCulled = false - if (child.material.name.includes("trans")) { - child.material.trasparent = true - } + //if (child.material.name.includes("trans")) { + // child.material.trasparent = true + //} child.material.envMapIntensity = 0.3 } }) @@ -219,7 +219,7 @@ async function init() { "./3d_scenery/museum_hall_painting2.glb", "./3d_scenery/museum_hall_painting3.glb", "./3d_scenery/museum_hall_painting4.glb", - "./3d_scenery/blockstack.glb", + "./3d_scenery/vase.glb", "./3d_scenery/businessman.glb", "./3d_scenery/arrow.glb" ], @@ -244,8 +244,8 @@ async function init() { addToScene("link5") addToScene("businessman", { position: [6.4203, -0.8, -3.1523], rotation: [0, -Math.PI / 2, 0], scale: [3, 3, 3] }) addToScene("arrow", { position: [0, 0, 0], rename: "a1", nav: [0,5,0]}) - addToScene("arrow", { position: [0, 0, 10], rename: "a2", nav: [0,5,0] }) - addToScene("arrow", { position: [0, 0, -10], rename: "a3", nav: [0,5,0] }) + addToScene("arrow", { position: [0, 0, 8], rename: "a2", nav: [0,5,0] }) + addToScene("arrow", { position: [0, 0, -8], rename: "a3", nav: [0,5,0] }) addToScene("arrow", { position: [6.4203, 2, -1], rename: "a4", nav: [0,3,0] }) //Lights and fog