From caf851ca37a099b1dea003d7ba490fed649f5754 Mon Sep 17 00:00:00 2001 From: Lars Martens Date: Mon, 23 Mar 2015 16:21:14 +0100 Subject: [PATCH] More Explicit Folder Names Also fixed those THREE.js warnings, that CubeGeometry was outdated, now using BoxGeometry. --- {ic => images}/github.png | Bin {ic => images}/icon.png | Bin {ic => images}/reddit.png | Bin {ic => images}/slots.png | Bin {ic => images}/twitter.png | Bin index.htm | 12 ++++++------ main.js => js/main.js | 24 ++++++++++++------------ three.js => js/three.js | 0 style.css | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) rename {ic => images}/github.png (100%) rename {ic => images}/icon.png (100%) rename {ic => images}/reddit.png (100%) rename {ic => images}/slots.png (100%) rename {ic => images}/twitter.png (100%) rename main.js => js/main.js (96%) rename three.js => js/three.js (100%) diff --git a/ic/github.png b/images/github.png similarity index 100% rename from ic/github.png rename to images/github.png diff --git a/ic/icon.png b/images/icon.png similarity index 100% rename from ic/icon.png rename to images/icon.png diff --git a/ic/reddit.png b/images/reddit.png similarity index 100% rename from ic/reddit.png rename to images/reddit.png diff --git a/ic/slots.png b/images/slots.png similarity index 100% rename from ic/slots.png rename to images/slots.png diff --git a/ic/twitter.png b/images/twitter.png similarity index 100% rename from ic/twitter.png rename to images/twitter.png diff --git a/index.htm b/index.htm index 16b3df0..65fe757 100644 --- a/index.htm +++ b/index.htm @@ -4,14 +4,14 @@ Minecraft Armor Stand - + - + - +
@@ -21,9 +21,9 @@ Please note: some rotation values do not work correctly.
- GitHub - Reddit - Twitter + GitHub + Reddit + Twitter

diff --git a/main.js b/js/main.js similarity index 96% rename from main.js rename to js/main.js index 42f1b9e..a146970 100644 --- a/main.js +++ b/js/main.js @@ -124,13 +124,13 @@ function setup(){ //BasePlate mBasePlate = new THREE.Mesh( - new THREE.CubeGeometry(12/16, 1/16, 12/16), + new THREE.BoxGeometry(12/16, 1/16, 12/16), matStone); mBasePlate.position.y = - (1/32 - armorstand.position.y); armorstandWrapper.add(mBasePlate); //Add a little dot, so the user knows which way is forward var mmBaseDot = new THREE.Mesh( - new THREE.CubeGeometry(2/16, 1/16, 4/16), + new THREE.BoxGeometry(2/16, 1/16, 4/16), matStone); mmBaseDot.position.set(0,mBasePlate.position.y,10/16); armorstandWrapper.add(mmBaseDot); @@ -140,7 +140,7 @@ function setup(){ //Left Leg var mmLegLeft = new THREE.Mesh( - new THREE.CubeGeometry(2/16, 11/16, 2/16), + new THREE.BoxGeometry(2/16, 11/16, 2/16), matWood); mmLegLeft.position.set(0,-5.5/16,0); mLegLeft = new THREE.Object3D(); @@ -150,7 +150,7 @@ function setup(){ //Right Leg var mmLegRight = new THREE.Mesh( - new THREE.CubeGeometry(2/16, 11/16, 2/16), + new THREE.BoxGeometry(2/16, 11/16, 2/16), matWood); mmLegRight.position.set(0,-5.5/16,0); mLegRight = new THREE.Object3D(); @@ -160,7 +160,7 @@ function setup(){ //Left Arm var mmArmLeft = new THREE.Mesh( - new THREE.CubeGeometry(2/16, 12/16, 2/16), + new THREE.BoxGeometry(2/16, 12/16, 2/16), matWood); mmArmLeft.position.set(0,-4/16,0); mArmLeft = new THREE.Object3D(); @@ -170,7 +170,7 @@ function setup(){ //Right Arm var mmArmRight = new THREE.Mesh( - new THREE.CubeGeometry(2/16, 12/16, 2/16), + new THREE.BoxGeometry(2/16, 12/16, 2/16), matWood); mmArmRight.position.set(0,-4/16,0); mArmRight = new THREE.Object3D(); @@ -180,19 +180,19 @@ function setup(){ //Body (consists of four parts) var mmHip = new THREE.Mesh( - new THREE.CubeGeometry(8/16, 2/16, 2/16), + new THREE.BoxGeometry(8/16, 2/16, 2/16), matWood); mmHip.position.set(0,-11/16,0); var mmBodyLeft = new THREE.Mesh( - new THREE.CubeGeometry(2/16, 7/16, 2/16), + new THREE.BoxGeometry(2/16, 7/16, 2/16), matWood); mmBodyLeft.position.set(2/16,-6.5/16,0); var mmBodyRight = new THREE.Mesh( - new THREE.CubeGeometry(2/16, 7/16, 2/16), + new THREE.BoxGeometry(2/16, 7/16, 2/16), matWood); mmBodyRight.position.set(-2/16,-6.5/16,0); var mmShoulders = new THREE.Mesh( - new THREE.CubeGeometry(12/16, 3/16, 3/16), + new THREE.BoxGeometry(12/16, 3/16, 3/16), matWood); mmShoulders.position.set(0,-1.5/16,0); mBody = new THREE.Object3D(); @@ -205,14 +205,14 @@ function setup(){ //Head (neck and skull) var mmNeck = new THREE.Mesh( - new THREE.CubeGeometry(2/16, 7/16, 2/16), + new THREE.BoxGeometry(2/16, 7/16, 2/16), matWood); mmNeck.position.set(0,3.5/16,0); /* We do not want the head, as it obstructs a whole lot of the view. We can implement this, once we've got an editor option to toggle it on and off. var mmSkull = new THREE.Mesh( - new THREE.CubeGeometry(10/16, 10/16, 10/16), + new THREE.BoxGeometry(10/16, 10/16, 10/16), matWood); mmSkull.position.set(0,5/16,0);*/ mHead = new THREE.Object3D(); diff --git a/three.js b/js/three.js similarity index 100% rename from three.js rename to js/three.js diff --git a/style.css b/style.css index 206615a..4d909c4 100644 --- a/style.css +++ b/style.css @@ -85,7 +85,7 @@ a{ #disabledslots .sprite{ background-repeat: no-repeat; - background-image: url("ic/slots.png"); + background-image: url("images/slots.png"); width: 16px; height: 16px; display: inline-block;