Permalink
Browse files

Move monsters and items under assets/models/.

  • Loading branch information...
tapio committed Nov 28, 2012
1 parent b3cb429 commit 866eb5f4bca5a5ad11afba419e4daacb90869ee7
Showing with 5 additions and 5 deletions.
  1. 0 assets/{items → models}/ammo-box/ammo-box.js
  2. BIN assets/{items → models}/ammo-box/diffuse.jpg
  3. BIN assets/{items → models}/ammo-box/normal.jpg
  4. 0 assets/{items → models}/ammo-box/readme.txt
  5. BIN assets/{items → models}/ammo-box/specular.jpg
  6. BIN assets/{items → models}/ammo-box/thumb.jpg
  7. BIN assets/{items → models}/fork/diffuse.jpg
  8. 0 assets/{items → models}/fork/fork.js
  9. 0 assets/{items → models}/fork/readme.txt
  10. BIN assets/{items → models}/gun/diffuse.jpg
  11. 0 assets/{items → models}/gun/gun.js
  12. BIN assets/{items → models}/gun/normal.jpg
  13. 0 assets/{items → models}/gun/readme.txt
  14. BIN assets/{items → models}/gun/specular.jpg
  15. BIN assets/{items → models}/health-box/diffuse.jpg
  16. 0 assets/{items → models}/health-box/health-box.js
  17. BIN assets/{items → models}/health-box/normal.jpg
  18. 0 assets/{items → models}/health-box/readme.txt
  19. BIN assets/{items → models}/health-box/specular.jpg
  20. BIN assets/{items → models}/health-box/thumb.jpg
  21. BIN assets/{items → models}/heated-forks-box/diffuse.jpg
  22. 0 assets/{items → models}/heated-forks-box/heated-forks-box.js
  23. BIN assets/{items → models}/heated-forks-box/normal.jpg
  24. 0 assets/{items → models}/heated-forks-box/readme.txt
  25. BIN assets/{items → models}/heated-forks-box/specular.jpg
  26. BIN assets/{items → models}/heated-forks-box/thumb.jpg
  27. BIN assets/{items → models}/plasma-forks-box/diffuse.jpg
  28. BIN assets/{items → models}/plasma-forks-box/normal.jpg
  29. 0 assets/{items → models}/plasma-forks-box/plasma-forks-box.js
  30. 0 assets/{items → models}/plasma-forks-box/readme.txt
  31. BIN assets/{items → models}/plasma-forks-box/specular.jpg
  32. BIN assets/{items → models}/plasma-forks-box/thumb.jpg
  33. BIN assets/{monsters → models}/robot/diffuse-bottom.jpg
  34. BIN assets/{monsters → models}/robot/diffuse-top.jpg
  35. 0 assets/{monsters → models}/robot/readme.txt
  36. 0 assets/{monsters → models}/robot/robot.js
  37. +1 −1 editor/index.html
  38. +4 −4 js/dungeon.js
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -130,7 +130,7 @@ <h3>Level editor</h3>
// Items
for (i in assets.items) tools.item.items.push(i);
if (tools.item.items.length) tools.item.item = tools.item.items[0];
- createGallery("item-thumbs", tools.item.items, "obj-%1", "../assets/items/%1/thumb.jpg");
+ createGallery("item-thumbs", tools.item.items, "obj-%1", "../assets/models/%1/thumb.jpg");
// Monsters
for (i in assets.monsters) tools.monster.monsters.push(i);
View
@@ -425,7 +425,7 @@ function Dungeon(scene, player, levelName) {
if (!level.items) return;
for (var i = 0; i < level.items.length; ++i) {
var name = level.items[i].name;
- cache.loadModel("assets/items/" + name + "/" + name + ".js",
+ cache.loadModel("assets/models/" + name + "/" + name + ".js",
objectHandler(level, new THREE.Vector3().copy(level.items[i].position),
level.items[i].angle, assets.items[name]));
}
@@ -435,7 +435,7 @@ function Dungeon(scene, player, levelName) {
if (!level.monsters) return;
for (var i = 0; i < level.monsters.length; ++i) {
var name = level.monsters[i].name;
- cache.loadModel("assets/monsters/" + name + "/" + name + ".js",
+ cache.loadModel("assets/models/" + name + "/" + name + ".js",
objectHandler(level, new THREE.Vector3().copy(level.monsters[i].position),
level.monsters[i].angle, assets.monsters[name]));
}
@@ -471,7 +471,7 @@ function Dungeon(scene, player, levelName) {
controls.setYAngle(level.startAngle);
// Player gun
- cache.loadModel("assets/items/gun/gun.js", function(geometry, materials) {
+ cache.loadModel("assets/models/gun/gun.js", function(geometry, materials) {
player.rhand = new Physijs.BoxMesh(geometry, new THREE.MeshFaceMaterial(materials));
// Hack: Materials for gun screen in order to show ammo is out differently
player.rhand.ammoGood = materials[2].clone();
@@ -487,7 +487,7 @@ function Dungeon(scene, player, levelName) {
});
// Bullets
- cache.loadModel("assets/items/fork/fork.js", function(geometry, materials) {
+ cache.loadModel("assets/models/fork/fork.js", function(geometry, materials) {
self.forks = [];
self.forkIndex = 0;
self.forkTypes = {

0 comments on commit 866eb5f

Please sign in to comment.