haselkern/Minecraft-ArmorStand
1
0
Fork 0
mirror of https://github.com/haselkern/Minecraft-ArmorStand.git synced 2025-05-17 15:05:33 +00:00
Code Activity

More Explicit Folder Names

Browse source 
Also fixed those THREE.js warnings, that CubeGeometry was outdated, now
using BoxGeometry.
This commit is contained in:
Lars Martens 2015-03-23 16:21:14 +01:00
parent 0a1a092233
commit caf851ca37
9 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

0
ic/github.png → images/github.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

0
ic/icon.png → images/icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 360 B

After

Width:  |  Height:  |  Size: 360 B

Before After
Before After

0
ic/reddit.png → images/reddit.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

0
ic/slots.png → images/slots.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 570 B

After

Width:  |  Height:  |  Size: 570 B

Before After
Before After

0
ic/twitter.png → images/twitter.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

12
index.htm
View file

@ -4,14 +4,14 @@
<title>Minecraft Armor Stand</title> <title>Minecraft Armor Stand</title>
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="stylesheet" href="style.css"> <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=Oswald:700' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Roboto+Condensed: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> <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
</head> </head>
<body> <body>
<script src="main.js"></script> <script src="js/main.js"></script>
<div id="gl"></div> <div id="gl"></div>
@ -21,9 +21,9 @@
<b>Please note:</b> some rotation values do not work correctly. <b>Please note:</b> some rotation values do not work correctly.
<div class="padding"> <div class="padding">
<center> <center>
<a href="https://github.com/haselkern/Minecraft-ArmorStand" target="_blank"><img src="ic/github.png" alt="GitHub" title="GitHub" /></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="ic/reddit.png" alt="Reddit" title="Reddit" /></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="ic/twitter.png" alt="Twitter" title="Twitter" /></a> <a href="http://www.twitter.com/haselcode" target="_blank"><img src="images/twitter.png" alt="Twitter" title="Twitter" /></a>
</center> </center>
<br> <br>
<span class="padding" style="cursor: pointer;" onclick="javascript:$('#troubleshooting').slideToggle();"> <span class="padding" style="cursor: pointer;" onclick="javascript:$('#troubleshooting').slideToggle();">

24
main.js → js/main.js
View file

@ -124,13 +124,13 @@ function setup(){
//BasePlate //BasePlate
mBasePlate = new THREE.Mesh( mBasePlate = new THREE.Mesh(
new THREE.CubeGeometry(12/16, 1/16, 12/16), new THREE.BoxGeometry(12/16, 1/16, 12/16),
matStone); matStone);
mBasePlate.position.y = - (1/32 - armorstand.position.y); mBasePlate.position.y = - (1/32 - armorstand.position.y);
armorstandWrapper.add(mBasePlate); armorstandWrapper.add(mBasePlate);
//Add a little dot, so the user knows which way is forward //Add a little dot, so the user knows which way is forward
var mmBaseDot = new THREE.Mesh( var mmBaseDot = new THREE.Mesh(
new THREE.CubeGeometry(2/16, 1/16, 4/16), new THREE.BoxGeometry(2/16, 1/16, 4/16),
matStone); matStone);
mmBaseDot.position.set(0,mBasePlate.position.y,10/16); mmBaseDot.position.set(0,mBasePlate.position.y,10/16);
armorstandWrapper.add(mmBaseDot); armorstandWrapper.add(mmBaseDot);
@ -140,7 +140,7 @@ function setup(){
//Left Leg //Left Leg
var mmLegLeft = new THREE.Mesh( var mmLegLeft = new THREE.Mesh(
new THREE.CubeGeometry(2/16, 11/16, 2/16), new THREE.BoxGeometry(2/16, 11/16, 2/16),
matWood); matWood);
mmLegLeft.position.set(0,-5.5/16,0); mmLegLeft.position.set(0,-5.5/16,0);
mLegLeft = new THREE.Object3D(); mLegLeft = new THREE.Object3D();
@ -150,7 +150,7 @@ function setup(){
//Right Leg //Right Leg
var mmLegRight = new THREE.Mesh( var mmLegRight = new THREE.Mesh(
new THREE.CubeGeometry(2/16, 11/16, 2/16), new THREE.BoxGeometry(2/16, 11/16, 2/16),
matWood); matWood);
mmLegRight.position.set(0,-5.5/16,0); mmLegRight.position.set(0,-5.5/16,0);
mLegRight = new THREE.Object3D(); mLegRight = new THREE.Object3D();
@ -160,7 +160,7 @@ function setup(){
//Left Arm //Left Arm
var mmArmLeft = new THREE.Mesh( var mmArmLeft = new THREE.Mesh(
new THREE.CubeGeometry(2/16, 12/16, 2/16), new THREE.BoxGeometry(2/16, 12/16, 2/16),
matWood); matWood);
mmArmLeft.position.set(0,-4/16,0); mmArmLeft.position.set(0,-4/16,0);
mArmLeft = new THREE.Object3D(); mArmLeft = new THREE.Object3D();
@ -170,7 +170,7 @@ function setup(){
//Right Arm //Right Arm
var mmArmRight = new THREE.Mesh( var mmArmRight = new THREE.Mesh(
new THREE.CubeGeometry(2/16, 12/16, 2/16), new THREE.BoxGeometry(2/16, 12/16, 2/16),
matWood); matWood);
mmArmRight.position.set(0,-4/16,0); mmArmRight.position.set(0,-4/16,0);
mArmRight = new THREE.Object3D(); mArmRight = new THREE.Object3D();
@ -180,19 +180,19 @@ function setup(){
//Body (consists of four parts) //Body (consists of four parts)
var mmHip = new THREE.Mesh( var mmHip = new THREE.Mesh(
new THREE.CubeGeometry(8/16, 2/16, 2/16), new THREE.BoxGeometry(8/16, 2/16, 2/16),
matWood); matWood);
mmHip.position.set(0,-11/16,0); mmHip.position.set(0,-11/16,0);
var mmBodyLeft = new THREE.Mesh( var mmBodyLeft = new THREE.Mesh(
new THREE.CubeGeometry(2/16, 7/16, 2/16), new THREE.BoxGeometry(2/16, 7/16, 2/16),
matWood); matWood);
mmBodyLeft.position.set(2/16,-6.5/16,0); mmBodyLeft.position.set(2/16,-6.5/16,0);
var mmBodyRight = new THREE.Mesh( var mmBodyRight = new THREE.Mesh(
new THREE.CubeGeometry(2/16, 7/16, 2/16), new THREE.BoxGeometry(2/16, 7/16, 2/16),
matWood); matWood);
mmBodyRight.position.set(-2/16,-6.5/16,0); mmBodyRight.position.set(-2/16,-6.5/16,0);
var mmShoulders = new THREE.Mesh( var mmShoulders = new THREE.Mesh(
new THREE.CubeGeometry(12/16, 3/16, 3/16), new THREE.BoxGeometry(12/16, 3/16, 3/16),
matWood); matWood);
mmShoulders.position.set(0,-1.5/16,0); mmShoulders.position.set(0,-1.5/16,0);
mBody = new THREE.Object3D(); mBody = new THREE.Object3D();
@ -205,14 +205,14 @@ function setup(){
//Head (neck and skull) //Head (neck and skull)
var mmNeck = new THREE.Mesh( var mmNeck = new THREE.Mesh(
new THREE.CubeGeometry(2/16, 7/16, 2/16), new THREE.BoxGeometry(2/16, 7/16, 2/16),
matWood); matWood);
mmNeck.position.set(0,3.5/16,0); 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, 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. once we've got an editor option to toggle it on and off.
var mmSkull = new THREE.Mesh( var mmSkull = new THREE.Mesh(
new THREE.CubeGeometry(10/16, 10/16, 10/16), new THREE.BoxGeometry(10/16, 10/16, 10/16),
matWood); matWood);
mmSkull.position.set(0,5/16,0);*/ mmSkull.position.set(0,5/16,0);*/
mHead = new THREE.Object3D(); mHead = new THREE.Object3D();

0
three.js → js/three.js
View file

2
style.css
View file

@ -85,7 +85,7 @@ a{
#disabledslots .sprite{ #disabledslots .sprite{
background-repeat: no-repeat; background-repeat: no-repeat;
background-image: url("ic/slots.png"); background-image: url("images/slots.png");
width: 16px; width: 16px;
height: 16px; height: 16px;
display: inline-block; display: inline-block;