FIX: Some fixes on lights.

albertoamo · Nov 2, 2018 · 4d7b62a · 4d7b62a
1 parent 143e08e
commit 4d7b62a
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 111 deletions.
diff --git a/Bin/data/prefabs/foco_brian.prefab b/Bin/data/prefabs/foco_brian.prefab
@@ -1,52 +1,34 @@
-[
-  {
-    "entity":
-    {
-      "name": "foco_brian"
-      ,
-      "transform":
-      {
-        "pos": "0.0 0.0 0.0"
-      }
-    }
-  }
-  ,
-  {
-    "entity":
-    {
-      "name": "mesh_spotlight"
-      ,
-      "transform":
-      {
-        "pos": "0.0 0.0 0.0"
-      }
-      ,
-      "render":
-      [
-        {
-          "mesh": "data/meshes/mesh_spotlight.mesh"
-          ,
-          "materials":
-          [
-            "data/materials/mtl_spotlight.material"
-            ,
-            "data/materials/flare.material"
-            ,
-            "data/materials/spot.material"
-          ]
-        }
-      ]
-      ,
-      "collider":
-      {
-        "shape": "mesh"
-        ,
-        "name": "data/colliders/collider_spotlight.collider"
-      }
-      ,
-      "abs_aabb": true
-      ,
-      "local_aabb": true
-    }
-  }
+[{
+		"entity": {
+			"name": "foco_brian",
+			"transform": {
+				"pos": "0.0 0.0 0.0"
+			}
+		}
+	}, {
+		"entity": {
+			"name": "mesh_spotlight",
+			"transform": {
+				"pos": "0.0 0.0 0.0"
+			},
+			"render":
+			[{
+					"mesh": "data/meshes/mesh_spotlight.mesh",
+					"self_intensity": 0.120,
+					"materials":
+					[
+						"data/materials/mtl_spotlight.material",
+						"data/materials/flare.material",
+						"data/materials/spot.material"
+					]
+				}
+			],
+			"collider": {
+				"shape": "mesh",
+				"name": "data/colliders/collider_spotlight.collider"
+			},
+			"abs_aabb": true,
+			"local_aabb": true
+		}
+	}
 ]
diff --git a/Bin/data/resource_list/to_add/scene_basilic_courtyard.txt b/Bin/data/resource_list/to_add/scene_basilic_courtyard.txt
@@ -187,6 +187,7 @@ data/textures/tx_andamio_rgh.dds
 data/materials/mtl_andamio.material
 data/prefabs/andamio.prefab
 data/meshes/mesh_andamio.mesh
+data/scenes/BC_andamios_2.scene
 data/scenes/BC_coberturas.scene
 data/prefabs/piezaconcreto.prefab
 data/meshes/mesh_piezaconcreto.mesh

diff --git a/Bin/data/resource_list/to_add/scene_basilic_interior.txt b/Bin/data/resource_list/to_add/scene_basilic_interior.txt
@@ -276,6 +276,10 @@ data/meshes/im_monitor_pantalla_1.mesh
 data/materials/mtl_monitores_interior.material
 data/meshes/im_monitor_pantalla_2.mesh
 data/meshes/im_monitor_pantalla_3.mesh
+data/scenes/basilic_interior_monitores_bordes.scene
+data/meshes/bi_monitor003.mesh
+data/meshes/bi_monitor002.mesh
+data/meshes/bi_monitor1.mesh
 data/scenes/basilic_interior_luces.scene
 data/colliders/luz_lateral.collider
 data/colliders/luz_lateral001.collider

diff --git a/Bin/data/resource_list/to_add/scene_intro.txt b/Bin/data/resource_list/to_add/scene_intro.txt
@@ -457,8 +457,6 @@ data/prefabs/neon_amarillo_1.prefab
 data/meshes/neon_cartel_amarillo_1.mesh
 data/colliders/collider_cartel_amarillo_1.collider
 data/particles/def_amb_flare_neon_yellow1.particles
-data/colliders/Spot002.collider
-data/colliders/Spot003.collider
 data/colliders/Spot005.collider
 data/colliders/Spot006.collider
 data/colliders/Spot008.collider

diff --git a/Bin/data/scenes/basiliclights.scene b/Bin/data/scenes/basiliclights.scene
@@ -1528,7 +1528,7 @@
   }
   ,
   {
-    "entity":
+    "xentity":
     {
       "name": "bc_Omni099"
       ,
@@ -6495,7 +6495,7 @@
       ,
       "transform":
       {
-        "pos": "4.50269 2.49022 -336.814"
+        "pos": "4.50269 2.49022 -329.814"
         ,
         "lookat": "4.57702 0.245741 -316.78"
       }