repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 4508274a474d8140815fbdf7a2bcf6c4bb723394:
path_to: 
revision_to: 

commit 4508274a474d8140815fbdf7a2bcf6c4bb723394
Author: James Baicoianu 
Date:   Thu Jan 5 18:30:37 2017 -0800

    Set hasalpha parameter hint for png textures with no alpha

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

--- a/media/assets.json
+++ b/media/assets.json
@@ -9,43 +9,44 @@
   { "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" },
-  { "assettype":"model", "name":"room2", "src":"assets/rooms/room2.obj", "tex0":"assets/rooms/room2.png" },
-  { "assettype":"model", "name":"room3", "src":"assets/rooms/room3.obj", "tex0":"assets/rooms/room3.png" },
-  { "assettype":"model", "name":"room4", "src":"assets/rooms/room4.obj", "tex0":"assets/rooms/room4.png" },
-  { "assettype":"model", "name":"room5", "src":"assets/rooms/room5.obj", "tex0":"assets/rooms/room5.png" },
-  { "assettype":"model", "name":"room6", "src":"assets/rooms/room6.obj", "tex0":"assets/rooms/room6.png" },
-  { "assettype":"model", "name":"room_1pedestal", "src":"assets/rooms/room_1pedestal.obj", "tex0":"assets/rooms/room_1pedestal.png" },
-  { "assettype":"model", "name":"room_2pedestal", "src":"assets/rooms/room_2pedestal.obj", "tex0":"assets/rooms/room_2pedestal.png" },
-  { "assettype":"model", "name":"room_3_narrow", "src":"assets/rooms/room_3_narrow.obj", "tex0":"assets/rooms/room_3_narrow.png" },
-  { "assettype":"model", "name":"room_3_wide", "src":"assets/rooms/room_3_wide.obj", "tex0":"assets/rooms/room_3_wide.png" },
-  { "assettype":"model", "name":"room_4_narrow", "src":"assets/rooms/room_4_narrow.obj", "tex0":"assets/rooms/room_4_narrow.png" },
-  { "assettype":"model", "name":"room_4_wide", "src":"assets/rooms/room_4_wide.obj", "tex0":"assets/rooms/room_4_wide.png" },
-  { "assettype":"model", "name":"room_box_small", "src":"assets/rooms/room_box_small.obj", "tex0":"assets/rooms/room_box_small.png" },
-  { "assettype":"model", "name":"room_box_medium", "src":"assets/rooms/room_box_medium.obj", "tex0":"assets/rooms/room_box_medium.png" },
-  { "assettype":"model", "name":"room1_new", "src":"assets/rooms/room1_new.obj", "tex0":"assets/rooms/room1_new.png" },
-  { "assettype":"model", "name":"room_home", "src":"assets/rooms/room_home.obj", "tex0":"assets/rooms/room_home.png" },
-  { "assettype":"model", "name":"room_plane", "src":"assets/rooms/room_plane.obj", "tex0":"assets/rooms/tile_d.png" },
-  { "assettype":"model", "name":"room_plane2", "src":"assets/rooms/room_plane2.obj", "tex0":"assets/rooms/room_plane2.png" },
+  { "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":"dark_back", "src":"assets/skybox/dark_back.png" },
-  { "assettype":"image", "name":"dark_down", "src":"assets/skybox/dark_down.png" },
-  { "assettype":"image", "name":"dark_front", "src":"assets/skybox/dark_front.png" },
-  { "assettype":"image", "name":"dark_left", "src":"assets/skybox/dark_left.png" },
-  { "assettype":"image", "name":"dark_right", "src":"assets/skybox/dark_right.png" },
-  { "assettype":"image", "name":"dark_up", "src":"assets/skybox/dark_up.png" },
-  { "assettype":"image", "name":"miramar_back", "src":"assets/skybox/miramar_back.png" },
-  { "assettype":"image", "name":"miramar_down", "src":"assets/skybox/miramar_down.png" },
-  { "assettype":"image", "name":"miramar_front", "src":"assets/skybox/miramar_front.png" },
-  { "assettype":"image", "name":"miramar_left", "src":"assets/skybox/miramar_left.png" },
-  { "assettype":"image", "name":"miramar_right", "src":"assets/skybox/miramar_right.png" },
-  { "assettype":"image", "name":"miramar_up", "src":"assets/skybox/miramar_up.png" },
-  { "assettype":"image", "name":"skyrender_back", "src":"assets/skybox/skyrender_back.png" },
-  { "assettype":"image", "name":"skyrender_down", "src":"assets/skybox/skyrender_down.png" },
-  { "assettype":"image", "name":"skyrender_front", "src":"assets/skybox/skyrender_front.png" },
-  { "assettype":"image", "name":"skyrender_left", "src":"assets/skybox/skyrender_left.png" },
-  { "assettype":"image", "name":"skyrender_right", "src":"assets/skybox/skyrender_right.png" },
-  { "assettype":"image", "name":"skyrender_up", "src":"assets/skybox/skyrender_up.png" },
+  { "assettype":"image", "name":"black", "src":"assets/black.png", "hasalpha": false },
+  { "assettype":"image", "name":"dark_back", "src":"assets/skybox/dark_back.png", "hasalpha": false },
+  { "assettype":"image", "name":"dark_down", "src":"assets/skybox/dark_down.png", "hasalpha": false },
+  { "assettype":"image", "name":"dark_front", "src":"assets/skybox/dark_front.png", "hasalpha": false },
+  { "assettype":"image", "name":"dark_left", "src":"assets/skybox/dark_left.png", "hasalpha": false },
+  { "assettype":"image", "name":"dark_right", "src":"assets/skybox/dark_right.png", "hasalpha": false },
+  { "assettype":"image", "name":"dark_up", "src":"assets/skybox/dark_up.png", "hasalpha": false },
+  { "assettype":"image", "name":"miramar_back", "src":"assets/skybox/miramar_back.png", "hasalpha": false },
+  { "assettype":"image", "name":"miramar_down", "src":"assets/skybox/miramar_down.png", "hasalpha": false },
+  { "assettype":"image", "name":"miramar_front", "src":"assets/skybox/miramar_front.png", "hasalpha": false },
+  { "assettype":"image", "name":"miramar_left", "src":"assets/skybox/miramar_left.png", "hasalpha": false },
+  { "assettype":"image", "name":"miramar_right", "src":"assets/skybox/miramar_right.png", "hasalpha": false },
+  { "assettype":"image", "name":"miramar_up", "src":"assets/skybox/miramar_up.png", "hasalpha": false },
+  { "assettype":"image", "name":"skyrender_back", "src":"assets/skybox/skyrender_back.png", "hasalpha": false },
+  { "assettype":"image", "name":"skyrender_down", "src":"assets/skybox/skyrender_down.png", "hasalpha": false },
+  { "assettype":"image", "name":"skyrender_front", "src":"assets/skybox/skyrender_front.png", "hasalpha": false },
+  { "assettype":"image", "name":"skyrender_left", "src":"assets/skybox/skyrender_left.png", "hasalpha": false },
+  { "assettype":"image", "name":"skyrender_right", "src":"assets/skybox/skyrender_right.png", "hasalpha": false },
+  { "assettype":"image", "name":"skyrender_up", "src":"assets/skybox/skyrender_up.png", "hasalpha": 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" },
@@ -55,9 +56,9 @@

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

-  { "assettype":"image", "name":"cursor_arrow", "src":"assets/cursor/arrow.png" },
-  { "assettype":"image", "name":"cursor_crosshair", "src":"assets/cursor/crosshair.png" },
-  { "assettype":"image", "name":"cursor_hand", "src":"assets/cursor/hand.png" },
+  { "assettype":"image", "name":"cursor_arrow", "src":"assets/cursor/arrow.png", "hasalpha": true },
+  { "assettype":"image", "name":"cursor_crosshair", "src":"assets/cursor/crosshair.png", "hasalpha": true },
+  { "assettype":"image", "name":"cursor_hand", "src":"assets/cursor/hand.png", "hasalpha": true },


   { "assettype":"model", "name":"controller_vive", "src":"assets/controllers/vive/ViveController.dae.gz" },

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