Merge branch 'Feature/ProLights' into dev

# Conflicts:
#	Bin/data/boot.json
#	Bin/data/components.json
#	Bin/data/modules.json
#	Bin/data/prefabs/patrol.prefab
#	Bin/data/scenes/bt_test.scene
#	Bin/data/scenes/enemy.scene
#	Bin/data/scenes/player_fsm.scene
#	Bin/data/scenes/skeleton_demo.scene
#	Bin/data/techniques.json
#	source/Game.vcxproj
#	source/Game.vcxproj.filters
#	source/fsm/custom_states.cpp
#	source/modules/game/module_map_intro.cpp
#	source/render/render_objects.cpp
#	source/render/render_utils.cpp
#	source/render/shaders/vertex_declarations.cpp

Bin/data/boot.json

@@ -1,22 +1,26 @@
 {
 	"intro_scenes" : [
 		"data/scenes/player_fsm.scene",
-		"data/scenes/milestone1_map_lights.scene",
-		"data/scenes/milestone1_map_meshes.scene",
-		"data/scenes/milestone1_map_colliders.scene",
 		"data/scenes/enemy.scene",
-    	"data/scenes/camera.scene",
+		"data/scenes/sp_dynamic_lights.scene",
 		"data/scenes/bt_test.scene",
 		"data/scenes/skeleton_crab.scene"
+		"data/scenes/milestone2_map.scene",
+		"data/scenes/milestone2_map_lights.scene",
+		"data/scenes/milestone2_map_colliders.scene",
+		"data/scenes/capsules.scene",
+		"data/scenes/camera.scene",
+		"data/scenes/water_plane.scene"
 	],
 	"light_scenes_test" : [
 		"data/scenes/player_fsm.scene",
-		"data/scenes/milestone1_map_lights.scene",
-		"data/scenes/milestone1_map_meshes.scene",
-		"data/scenes/milestone1_map_colliders.scene",
 		"data/scenes/enemy.scene",
-		"data/scenes/camera.scene",
-		"data/scenes/capsules.scene"
+		"data/scenes/sp_dynamic_lights.scene",
+		"data/scenes/milestone2_map.scene",
+		"data/scenes/milestone2_map_lights.scene",
+		"data/scenes/milestone2_map_colliders.scene",
+		"data/scenes/capsules.scene",
+		"data/scenes/camera.scene"
 	],
   "unused_scenes" : [
     "dummy"

Bin/data/components.json

@@ -1,7 +1,7 @@
 {
-	"sizes": {
-		"default": 512,
-		"transform": 512
+	"sizes" : {
+		"default" : 1024,
+		"transform" : 1024
 	},
 	"init_order": {
 		"entity": 100,
@@ -24,6 +24,9 @@
 		"rigidbody",
 		"collider",
 		"noise_emitter",
+		"light_dir",
+		"light_spot",
+		"light_point",
 		"camera_flyover",
 		"curve_controller",
 		"trigger_camera",

Bin/data/materials/body.material

@@ -1,6 +1,4 @@
 {
-  "technique": "solid_normal.tech"
-  ,
   "shadows": true
   ,
   "textures":

Bin/data/materials/mtl_alminares.material

@@ -1,12 +1,11 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_houses.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_alminares.dds"
+    "albedo": "data/textures/m2/tx_concrete1-a.dds",
+		"normal": "data/textures/m2/tx_concrete1-n.dds",
+    "metallic": "data/textures/m2/tx_concrete1-r.dds",
+		"roughness": "data/textures/m2/tx_concrete1-r.dds"
   }
 }

Bin/data/materials/mtl_archs_end.material

@@ -1,12 +1,11 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_wall03.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_wallEnd.dds"
+    "albedo": "data/textures/m2/tx_brick2-a.dds",
+		"normal": "data/textures/m2/tx_brick2-n.dds",
+    "metallic": "data/textures/m2/tx_brick2-m.dds",
+		"roughness": "data/textures/m2/tx_brick2-r.dds"
   }
 }

Bin/data/materials/mtl_cathedral.material

@@ -1,12 +1,11 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_cathedral.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_cathedral.dds"
+    "albedo": "data/textures/m2/tx_brick2-a.dds",
+		"normal": "data/textures/m2/tx_brick2-n.dds",
+    "metallic": "data/textures/m2/tx_brick2-m.dds",
+		"roughness": "data/textures/m2/tx_brick2-r.dds"
   }
 }

Bin/data/materials/mtl_corner_houses.material

@@ -1,12 +1,10 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_desert.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_housesCorner.dds"
+    "albedo": "data/textures/m2/tx_concrete-a.dds",
+		"normal": "data/textures/m2/tx_concrete-n.dds",
+    "roughness": "data/textures/m2/tx_concrete-r.dds"
   }
 }

Bin/data/materials/mtl_default_casas_medio.material

@@ -1,12 +1,10 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_houses.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_housesMiddle.dds"
+    "albedo": "data/textures/m2/tx_floor-a.dds",
+		"normal": "data/textures/m2/tx_floor-n.dds",
+    "roughness": "data/textures/m2/tx_floor-r.dds"
   }
 }

Bin/data/materials/mtl_default_muralla_interior.material

@@ -1,12 +1,11 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_wall03.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_wallInterior.dds"
+    "albedo": "data/textures/m2/tx_brick2-a.dds",
+		"normal": "data/textures/m2/tx_brick2-n.dds",
+    "metallic": "data/textures/m2/tx_brick2-m.dds",
+		"roughness": "data/textures/m2/tx_brick2-r.dds"
   }
 }

Bin/data/materials/mtl_dome.material

@@ -1,12 +1,11 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_dome.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_cathedralDome.dds"
+    "albedo": "data/textures/m2/tx_dome-a.dds",
+		"normal": "data/textures/m2/tx_dome-n.dds",
+    "metallic": "data/textures/m2/tx_dome-m.dds",
+		"roughness": "data/textures/m2/tx_dome-r.dds"
   }
 }

Bin/data/materials/mtl_drophole.material

@@ -1,12 +1,10 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_wall04.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_drophole.dds"
+    "albedo": "data/textures/m2/tx_wall-a.dds",
+		"normal": "data/textures/m2/tx_wall-n.dds",
+    "roughness": "data/textures/m2/tx_wall-r.dds"
   }
 }

Bin/data/materials/mtl_enemy_crab.material

@@ -0,0 +1,13 @@
+{
+  "shadows": true
+  ,
+  "textures":
+  {
+    "albedo": "data/textures/enemy/tx_robotCrab_a.dds",
+		"normal": "data/textures/enemy/tx_robotCrab_n.dds",
+    "metallic": "data/textures/enemy/tx_robotCrab_m.dds",
+		"roughness": "data/textures/enemy/tx_robotCrab_r.dds",
+		"emissive": "data/textures/enemy/tx_robotCrab_e.dds"
+  },
+	"self_color" : "1.0 0.0 0.0 1.0"
+}

Bin/data/materials/mtl_floor.material

@@ -1,12 +1,12 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_floor.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_floor.dds"
+    "albedo": "data/textures/m2/New_Graph_basecolor_2.dds",
+		"normal": "data/textures/m2/New_Graph_normal.dds",
+    "roughness": "data/textures/m2/New_Graph_roughness.dds",
+		"metallic": "data/textures/m2/New_Graph_metallic.dds",
+		"emissive": "data/textures/m2/New_Graph_emissive.dds"
   }
 }

Bin/data/materials/mtl_houses_end.material

@@ -1,12 +1,10 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_desert.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_housesEnd.dds"
+    "albedo": "data/textures/m2/tx_concrete-a.dds",
+		"normal": "data/textures/m2/tx_concrete-n.dds",
+    "roughness": "data/textures/m2/tx_concrete-r.dds"
   }
 }

Bin/data/materials/mtl_houses_start.material

@@ -1,12 +1,10 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_houses.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_housesStart.dds"
+    "albedo": "data/textures/m2/tx_floor-a.dds",
+		"normal": "data/textures/m2/tx_floor-n.dds",
+    "roughness": "data/textures/m2/tx_floor-r.dds"
   }
 }

Bin/data/materials/mtl_lofts.material

@@ -1,12 +1,11 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_houses.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_loft.dds"
+    "albedo": "data/textures/m2/tx_rock-a.dds",
+		"normal": "data/textures/m2/tx_rock-n.dds",
+    "roughness": "data/textures/m2/tx_rock-r.dds",
+		"metallic": "data/textures/m2/tx_rock-m.dds"
   }
 }

Bin/data/materials/mtl_low_mecha.material

@@ -0,0 +1,14 @@
+{
+  "shadows": true
+  ,
+  "textures":
+  {
+    "albedo": "data/textures/enemy/Mech_low_1001_BaseColor.dds",
+		"normal": "data/textures/enemy/Mech_low_1001_Normal.dds",
+    "metallic": "data/textures/enemy/Mech_low_1001_Metallic.dds",
+		"roughness": "data/textures/enemy/Mech_low_1001_Roughness.dds",
+		"emissive": "data/textures/enemy/Mech_low_1001_Emissive.dds",
+		"lightmap": "data/textures/enemy/Mech_low_1001_Normal.dds"
+  },
+	"self_color" : "1.0 0.0 0.0 1.0"
+}

Bin/data/materials/mtl_metallic.material

@@ -1,12 +1,11 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_metal.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_metallic.dds"
+    "albedo": "data/textures/m2/tx_rust-a.dds",
+		"normal": "data/textures/m2/tx_rust-n.dds",
+    "metallic": "data/textures/m2/tx_rust-m.dds",
+		"roughness": "data/textures/m2/tx_rust-r.dds"
   }
 }

Bin/data/materials/mtl_palace_entrance.material

@@ -1,12 +1,11 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_floor02.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_palace.dds"
+    "albedo": "data/textures/m2/tx_rock-a.dds",
+		"normal": "data/textures/m2/tx_rock-n.dds",
+    "roughness": "data/textures/m2/tx_rock-r.dds",
+		"metallic": "data/textures/m2/tx_rock-m.dds"
   }
 }

Bin/data/materials/mtl_player_main.material

@@ -0,0 +1,15 @@
+{
+	"technique" : "pbr_player.tech"
+	,
+  "shadows": true
+  ,
+  "textures":
+  {
+    "albedo": "data/textures/player/Shade_mtl_BaseColor.dds",
+		"normal": "data/textures/player/Shade_mtl_Normal.dds",
+    "metallic": "data/textures/player/Shade_mtl_Metallic.dds",
+		"roughness": "data/textures/player/Shade_mtl_Roughness.dds",
+		"emissive": "data/textures/player/Shade_mtl_Emissive.dds"
+  },
+	"self_color" : "0.0 1.0 1.0 1.0"
+}

Bin/data/materials/mtl_tunel.material

@@ -1,12 +1,11 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_desert.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_tunnel.dds"
+    "albedo": "data/textures/wall/mybricks1_basecolor.dds",
+    "normal": "data/textures/wall/mybricks1_normal.dds",
+    "metallic": "data/textures/wall/mybricks1_metallic.dds",
+    "roughness": "data/textures/wall/mybricks1_roughness.dds"
   }
 }

Bin/data/materials/mtl_wall_middle.material

@@ -1,12 +1,11 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_wall03.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_wallMiddle.dds"
+    "albedo": "data/textures/m2/tx_brick2-a.dds",
+		"normal": "data/textures/m2/tx_brick2-n.dds",
+    "metallic": "data/textures/m2/tx_brick2-m.dds",
+		"roughness": "data/textures/m2/tx_brick2-r.dds"
   }
 }

Bin/data/materials/mtl_wall_start.material

@@ -1,12 +1,10 @@
 {
-  "technique": "textured_bk.tech"
-  ,
   "shadows": true
   ,
   "textures":
   {
-    "albedo": "data/textures/tx_df_wall03.dds"
-    ,
-    "lightmap": "data/textures/tx_lm_wallStart.dds"
+    "albedo": "data/textures/m2/tx_brick2-a.dds",
+		"normal": "data/textures/m2/tx_brick2-n.dds",
+		"roughness": "data/textures/m2/tx_brick2-r.dds"
   }
 }