repo: janusweb
action: commit
revision: 
path_from: 
revision_from: f7ca3cffc690b887c2f65c061f8691773ca091ef:
path_to: 
revision_to: 

commit f7ca3cffc690b887c2f65c061f8691773ca091ef
Author: James Baicoianu 
Date:   Tue Oct 31 06:01:12 2017 -0700

    Use image_id for tex0 parameters

diff --git a/media/assets.json b/media/assets.json

--- a/media/assets.json
+++ b/media/assets.json
@@ -9,24 +9,43 @@
   { "assettype":"model", "name":"sphere", "src":"assets/primitives/sphere.obj" },
   { "assettype":"model", "name":"torus", "src":"assets/primitives/torus.obj" },

-  { "assettype":"model", "name":"room1", "src":"assets/rooms/room1.obj", "tex0":"assets/rooms/room1.png", "hasalpha": false },
-  { "assettype":"model", "name":"room2", "src":"assets/rooms/room2.obj", "tex0":"assets/rooms/room2.png", "hasalpha": false },
-  { "assettype":"model", "name":"room3", "src":"assets/rooms/room3.obj", "tex0":"assets/rooms/room3.png", "hasalpha": false },
-  { "assettype":"model", "name":"room4", "src":"assets/rooms/room4.obj", "tex0":"assets/rooms/room4.png", "hasalpha": false },
-  { "assettype":"model", "name":"room5", "src":"assets/rooms/room5.obj", "tex0":"assets/rooms/room5.png", "hasalpha": false },
-  { "assettype":"model", "name":"room6", "src":"assets/rooms/room6.obj", "tex0":"assets/rooms/room6.png", "hasalpha": false },
-  { "assettype":"model", "name":"room_1pedestal", "src":"assets/rooms/room_1pedestal.obj", "tex0":"assets/rooms/room_1pedestal.png", "hasalpha": false },
-  { "assettype":"model", "name":"room_2pedestal", "src":"assets/rooms/room_2pedestal.obj", "tex0":"assets/rooms/room_2pedestal.png", "hasalpha": false },
-  { "assettype":"model", "name":"room_3_narrow", "src":"assets/rooms/room_3_narrow.obj", "tex0":"assets/rooms/room_3_narrow.png", "hasalpha": false },
-  { "assettype":"model", "name":"room_3_wide", "src":"assets/rooms/room_3_wide.obj", "tex0":"assets/rooms/room_3_wide.png", "hasalpha": false },
-  { "assettype":"model", "name":"room_4_narrow", "src":"assets/rooms/room_4_narrow.obj", "tex0":"assets/rooms/room_4_narrow.png", "hasalpha": false },
-  { "assettype":"model", "name":"room_4_wide", "src":"assets/rooms/room_4_wide.obj", "tex0":"assets/rooms/room_4_wide.png", "hasalpha": false },
-  { "assettype":"model", "name":"room_box_small", "src":"assets/rooms/room_box_small.obj", "tex0":"assets/rooms/room_box_small.png", "hasalpha": false },
-  { "assettype":"model", "name":"room_box_medium", "src":"assets/rooms/room_box_medium.obj", "tex0":"assets/rooms/room_box_medium.png", "hasalpha": false },
-  { "assettype":"model", "name":"room1_new", "src":"assets/rooms/room1_new.obj", "tex0":"assets/rooms/room1_new.png", "hasalpha": false },
-  { "assettype":"model", "name":"room_home", "src":"assets/rooms/room_home.obj", "tex0":"assets/rooms/room_home.png", "hasalpha": false },
-  { "assettype":"model", "name":"room_plane", "src":"assets/rooms/room_plane.obj", "tex0":"assets/rooms/tile_d.png", "hasalpha": false },
-  { "assettype":"model", "name":"room_plane2", "src":"assets/rooms/room_plane2.obj", "tex0":"assets/rooms/room_plane2.png", "hasalpha": false },
+  { "assettype":"image", "name":"room1_tex0", "src":"assets/rooms/room1.png", "hasalpha": false },
+  { "assettype":"image", "name":"room2_tex0", "src":"assets/rooms/room2.png", "hasalpha": false },
+  { "assettype":"image", "name":"room3_tex0", "src":"assets/rooms/room3.png", "hasalpha": false },
+  { "assettype":"image", "name":"room4_tex0", "src":"assets/rooms/room4.png", "hasalpha": false },
+  { "assettype":"image", "name":"room5_tex0", "src":"assets/rooms/room5.png", "hasalpha": false },
+  { "assettype":"image", "name":"room6_tex0", "src":"assets/rooms/room6.png", "hasalpha": false },
+  { "assettype":"image", "name":"room_1pedestal_tex0", "src":"assets/rooms/room_1pedestal.png", "hasalpha": false },
+  { "assettype":"image", "name":"room_2pedestal_tex0", "src":"assets/rooms/room_2pedestal.png", "hasalpha": false },
+  { "assettype":"image", "name":"room_3_narrow_tex0", "src":"assets/rooms/room_3_narrow.png", "hasalpha": false },
+  { "assettype":"image", "name":"room_3_wide_tex0", "src":"assets/rooms/room_3_wide.png", "hasalpha": false },
+  { "assettype":"image", "name":"room_4_narrow_tex0", "src":"assets/rooms/room_4_narrow.png", "hasalpha": false },
+  { "assettype":"image", "name":"room_4_wide_tex0", "src":"assets/rooms/room_4_wide.png", "hasalpha": false },
+  { "assettype":"image", "name":"room_box_small_tex0", "src":"assets/rooms/room_box_small.png", "hasalpha": false },
+  { "assettype":"image", "name":"room_box_medium_tex0", "src":"assets/rooms/room_box_medium.png", "hasalpha": false },
+  { "assettype":"image", "name":"room1_new_tex0", "src":"assets/rooms/room1_new.png", "hasalpha": false },
+  { "assettype":"image", "name":"room_home_tex0", "src":"assets/rooms/room_home.png", "hasalpha": false },
+  { "assettype":"image", "name":"room_plane_tex0", "src":"assets/rooms/tile_d.png", "hasalpha": false },
+  { "assettype":"image", "name":"room_plane2_tex0", "src":"assets/rooms/room_plane2.png", "hasalpha": false },
+
+  { "assettype":"model", "name":"room1", "src":"assets/rooms/room1.obj", "tex0":"room1_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room2", "src":"assets/rooms/room2.obj", "tex0":"room2_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room3", "src":"assets/rooms/room3.obj", "tex0":"room3_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room4", "src":"assets/rooms/room4.obj", "tex0":"room4_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room5", "src":"assets/rooms/room5.obj", "tex0":"room5_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room6", "src":"assets/rooms/room6.obj", "tex0":"room6_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room_1pedestal", "src":"assets/rooms/room_1pedestal.obj", "tex0":"room_1pedestal_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room_2pedestal", "src":"assets/rooms/room_2pedestal.obj", "tex0":"room_2pedestal_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room_3_narrow", "src":"assets/rooms/room_3_narrow.obj", "tex0":"room_3_narrow_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room_3_wide", "src":"assets/rooms/room_3_wide.obj", "tex0":"room_3_wide_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room_4_narrow", "src":"assets/rooms/room_4_narrow.obj", "tex0":"room_4_narrow_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room_4_wide", "src":"assets/rooms/room_4_wide.obj", "tex0":"room_4_wide_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room_box_small", "src":"assets/rooms/room_box_small.obj", "tex0":"room_box_small_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room_box_medium", "src":"assets/rooms/room_box_medium.obj", "tex0":"room_box_medium_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room1_new", "src":"assets/rooms/room1_new.obj", "tex0":"room1_new_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room_home", "src":"assets/rooms/room_home.obj", "tex0":"room_home_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room_plane", "src":"assets/rooms/room_plane.obj", "tex0":"room_plane_tex0", "hasalpha": false },
+  { "assettype":"model", "name":"room_plane2", "src":"assets/rooms/room_plane2.obj", "tex0":"room_plane2_tex0", "hasalpha": false },

   { "assettype":"model", "name":"room1_collision", "src":"assets/rooms/room1_collision.obj" },
   { "assettype":"model", "name":"room2_collision", "src":"assets/rooms/room2_collision.obj" },
@@ -79,10 +98,13 @@
   { "assettype":"image", "name":"nightskybox_right", "src":"assets/skybox/Night/Nightright.jpg", "hasalpha": false, "preload": false },
   { "assettype":"image", "name":"nightskybox_up", "src":"assets/skybox/Night/Nighttop.jpg", "hasalpha": false, "preload": false },

-  { "assettype":"model", "name":"avatar", "src":"assets/avatar.obj", "tex0": "assets/avatar.png" },
-  { "assettype":"model", "name":"avatar_head", "src":"assets/avatar_head.obj", "tex0": "assets/avatar_head.png" },
+  { "assettype":"model", "name":"avatar", "src":"assets/avatar.obj", "tex0": "avatar_tex0" },
+  { "assettype":"model", "name":"avatar_head", "src":"assets/avatar_head.obj", "tex0": "avatar_head_tex0" },
   { "assettype":"model", "name":"avatar_gltf", "src":"assets/Beta.gltf/Beta.gltf" },

+  { "assettype":"image", "name":"avatar_tex0", "src":"assets/avatar.png" },
+  { "assettype":"image", "name":"avatar_head_tex0", "src":"assets/avatar_head.png" },
+
   { "assettype":"model", "name":"avatar_janusweb", "src":"assets/hoverscreen.obj", "mtl": "assets/hoverscreen.mtl" },

   { "assettype":"model", "name":"loading", "src":"assets/loading.obj" },

-----END OF PAGE-----