Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move monsters and items under assets/models/.

  • Loading branch information...
commit 866eb5f4bca5a5ad11afba419e4daacb90869ee7 1 parent b3cb429
@tapio authored
Showing with 5 additions and 5 deletions.
  1. 0  assets/{items → models}/ammo-box/ammo-box.js
  2. 0  assets/{items → models}/ammo-box/diffuse.jpg
  3. 0  assets/{items → models}/ammo-box/normal.jpg
  4. 0  assets/{items → models}/ammo-box/readme.txt
  5. 0  assets/{items → models}/ammo-box/specular.jpg
  6. 0  assets/{items → models}/ammo-box/thumb.jpg
  7. 0  assets/{items → models}/fork/diffuse.jpg
  8. 0  assets/{items → models}/fork/fork.js
  9. 0  assets/{items → models}/fork/readme.txt
  10. 0  assets/{items → models}/gun/diffuse.jpg
  11. 0  assets/{items → models}/gun/gun.js
  12. 0  assets/{items → models}/gun/normal.jpg
  13. 0  assets/{items → models}/gun/readme.txt
  14. 0  assets/{items → models}/gun/specular.jpg
  15. 0  assets/{items → models}/health-box/diffuse.jpg
  16. 0  assets/{items → models}/health-box/health-box.js
  17. 0  assets/{items → models}/health-box/normal.jpg
  18. 0  assets/{items → models}/health-box/readme.txt
  19. 0  assets/{items → models}/health-box/specular.jpg
  20. 0  assets/{items → models}/health-box/thumb.jpg
  21. 0  assets/{items → models}/heated-forks-box/diffuse.jpg
  22. 0  assets/{items → models}/heated-forks-box/heated-forks-box.js
  23. 0  assets/{items/plasma-forks-box → models/heated-forks-box}/normal.jpg
  24. 0  assets/{items/plasma-forks-box → models/heated-forks-box}/readme.txt
  25. 0  assets/{items/plasma-forks-box → models/heated-forks-box}/specular.jpg
  26. 0  assets/{items → models}/heated-forks-box/thumb.jpg
  27. 0  assets/{items → models}/plasma-forks-box/diffuse.jpg
  28. 0  assets/{items/heated-forks-box → models/plasma-forks-box}/normal.jpg
  29. 0  assets/{items → models}/plasma-forks-box/plasma-forks-box.js
  30. 0  assets/{items/heated-forks-box → models/plasma-forks-box}/readme.txt
  31. 0  assets/{items/heated-forks-box → models/plasma-forks-box}/specular.jpg
  32. 0  assets/{items → models}/plasma-forks-box/thumb.jpg
  33. 0  assets/{monsters → models}/robot/diffuse-bottom.jpg
  34. 0  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
View
0  assets/items/ammo-box/ammo-box.js → assets/models/ammo-box/ammo-box.js
File renamed without changes
View
0  assets/items/ammo-box/diffuse.jpg → assets/models/ammo-box/diffuse.jpg
File renamed without changes
View
0  assets/items/ammo-box/normal.jpg → assets/models/ammo-box/normal.jpg
File renamed without changes
View
0  assets/items/ammo-box/readme.txt → assets/models/ammo-box/readme.txt
File renamed without changes
View
0  assets/items/ammo-box/specular.jpg → assets/models/ammo-box/specular.jpg
File renamed without changes
View
0  assets/items/ammo-box/thumb.jpg → assets/models/ammo-box/thumb.jpg
File renamed without changes
View
0  assets/items/fork/diffuse.jpg → assets/models/fork/diffuse.jpg
File renamed without changes
View
0  assets/items/fork/fork.js → assets/models/fork/fork.js
File renamed without changes
View
0  assets/items/fork/readme.txt → assets/models/fork/readme.txt
File renamed without changes
View
0  assets/items/gun/diffuse.jpg → assets/models/gun/diffuse.jpg
File renamed without changes
View
0  assets/items/gun/gun.js → assets/models/gun/gun.js
File renamed without changes
View
0  assets/items/gun/normal.jpg → assets/models/gun/normal.jpg
File renamed without changes
View
0  assets/items/gun/readme.txt → assets/models/gun/readme.txt
File renamed without changes
View
0  assets/items/gun/specular.jpg → assets/models/gun/specular.jpg
File renamed without changes
View
0  assets/items/health-box/diffuse.jpg → assets/models/health-box/diffuse.jpg
File renamed without changes
View
0  assets/items/health-box/health-box.js → assets/models/health-box/health-box.js
File renamed without changes
View
0  assets/items/health-box/normal.jpg → assets/models/health-box/normal.jpg
File renamed without changes
View
0  assets/items/health-box/readme.txt → assets/models/health-box/readme.txt
File renamed without changes
View
0  assets/items/health-box/specular.jpg → assets/models/health-box/specular.jpg
File renamed without changes
View
0  assets/items/health-box/thumb.jpg → assets/models/health-box/thumb.jpg
File renamed without changes
View
0  assets/items/heated-forks-box/diffuse.jpg → assets/models/heated-forks-box/diffuse.jpg
File renamed without changes
View
0  ...tems/heated-forks-box/heated-forks-box.js → ...dels/heated-forks-box/heated-forks-box.js
File renamed without changes
View
0  assets/items/plasma-forks-box/normal.jpg → assets/models/heated-forks-box/normal.jpg
File renamed without changes
View
0  assets/items/plasma-forks-box/readme.txt → assets/models/heated-forks-box/readme.txt
File renamed without changes
View
0  assets/items/plasma-forks-box/specular.jpg → assets/models/heated-forks-box/specular.jpg
File renamed without changes
View
0  assets/items/heated-forks-box/thumb.jpg → assets/models/heated-forks-box/thumb.jpg
File renamed without changes
View
0  assets/items/plasma-forks-box/diffuse.jpg → assets/models/plasma-forks-box/diffuse.jpg
File renamed without changes
View
0  assets/items/heated-forks-box/normal.jpg → assets/models/plasma-forks-box/normal.jpg
File renamed without changes
View
0  ...tems/plasma-forks-box/plasma-forks-box.js → ...dels/plasma-forks-box/plasma-forks-box.js
File renamed without changes
View
0  assets/items/heated-forks-box/readme.txt → assets/models/plasma-forks-box/readme.txt
File renamed without changes
View
0  assets/items/heated-forks-box/specular.jpg → assets/models/plasma-forks-box/specular.jpg
File renamed without changes
View
0  assets/items/plasma-forks-box/thumb.jpg → assets/models/plasma-forks-box/thumb.jpg
File renamed without changes
View
0  assets/monsters/robot/diffuse-bottom.jpg → assets/models/robot/diffuse-bottom.jpg
File renamed without changes
View
0  assets/monsters/robot/diffuse-top.jpg → assets/models/robot/diffuse-top.jpg
File renamed without changes
View
0  assets/monsters/robot/readme.txt → assets/models/robot/readme.txt
File renamed without changes
View
0  assets/monsters/robot/robot.js → assets/models/robot/robot.js
File renamed without changes
View
2  editor/index.html
@@ -130,7 +130,7 @@
// 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
8 js/dungeon.js
@@ -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 = {
Please sign in to comment.
Something went wrong with that request. Please try again.