More Explicit Folder Names

Also fixed those THREE.js warnings, that CubeGeometry was outdated, now using BoxGeometry.
2025-11-04 05:14:06 +00:00 · 2015-03-23 16:21:14 +01:00 · 2015-03-23 16:21:14 +01:00 · caf851ca37
commit caf851ca37
parent 0a1a092233
9 changed files with 19 additions and 19 deletions
--- a/images/github.png
+++ b/images/github.png
--- a/images/icon.png
+++ b/images/icon.png
--- a/images/reddit.png
+++ b/images/reddit.png
--- a/images/slots.png
+++ b/images/slots.png
--- a/images/twitter.png
+++ b/images/twitter.png
--- a/index.htm
+++ b/index.htm
@ -4,14 +4,14 @@
    <title>Minecraft Armor Stand</title>
    <meta charset="utf-8">
    <link rel="stylesheet" href="style.css">
-    <link rel="icon" type="image/png" href="ic/icon.png">
+    <link rel="icon" type="image/png" href="images/icon.png">
    <link href='http://fonts.googleapis.com/css?family=Oswald:700' rel='stylesheet' type='text/css'>
    <link href='http://fonts.googleapis.com/css?family=Roboto+Condensed:700' rel='stylesheet' type='text/css'>
-    <script src="three.js"></script>
+    <script src="js/three.js"></script>
    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
 </head>
 <body>
-    <script src="main.js"></script>
+    <script src="js/main.js"></script>

    <div id="gl"></div>

@ -21,9 +21,9 @@
        <b>Please note:</b> some rotation values do not work correctly.
        <div class="padding">
            <center>
-                <a href="https://github.com/haselkern/Minecraft-ArmorStand" target="_blank"><img src="ic/github.png" alt="GitHub" title="GitHub" /></a>
-                <a href="http://redd.it/2dyzfc" target="_blank"><img src="ic/reddit.png" alt="Reddit" title="Reddit" /></a>
-                <a href="http://www.twitter.com/haselcode" target="_blank"><img src="ic/twitter.png" alt="Twitter" title="Twitter" /></a>
+                <a href="https://github.com/haselkern/Minecraft-ArmorStand" target="_blank"><img src="images/github.png" alt="GitHub" title="GitHub" /></a>
+                <a href="http://redd.it/2dyzfc" target="_blank"><img src="images/reddit.png" alt="Reddit" title="Reddit" /></a>
+                <a href="http://www.twitter.com/haselcode" target="_blank"><img src="images/twitter.png" alt="Twitter" title="Twitter" /></a>
            </center>
                <br>
                <span class="padding" style="cursor: pointer;" onclick="javascript:$('#troubleshooting').slideToggle();">
--- a/js/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();
--- a/js/three.js
+++ b/js/three.js
--- 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;