3D model update.

Camera creation.
astrofra · Mar 24, 2019 · 50d4bbd · 50d4bbd
1 parent 71e89ed
commit 50d4bbd
Show file tree

Hide file tree

Showing 20 changed files with 544 additions and 84 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+/app/__pycache__/*.pyc
+codeStyleConfig.xml
+/.idea/encodings.xml
+git_pyweek27-gilda-six.iml
+misc.xml
+modules.xml
+vcs.xml
+workspace.xml
diff --git a/app/_prod/seville_city.FBX b/app/_prod/seville_city.FBX
diff --git a/app/assets/main_scene.scn b/app/assets/main_scene.scn
@@ -4,18 +4,18 @@
 			"Environment": {
 				"AmbientColor": {
 					"b": 0.1416,
-					"g": 0.0991,
-					"r": 0.0614
+					"g": 0.0992,
+					"r": 0.0615
 				},
 				"BackgroundColor": {
-					"b": 0.3009,
+					"b": 0.301,
 					"g": 0.1769,
-					"r": 0.1212
+					"r": 0.1213
 				},
 				"FogColor": {
-					"b": 0.3009,
+					"b": 0.301,
 					"g": 0.1769,
-					"r": 0.1212
+					"r": 0.1213
 				},
 				"FogFar": 200.0,
 				"FogNear": 100.0
@@ -29,14 +29,14 @@
 				"Components": {
 					"Transform": {
 						"Position": {
-							"x": -22.3546,
-							"y": 14.3081,
-							"z": -27.9989
+							"x": -6.5608,
+							"y": 13.9473,
+							"z": 15.1094
 						},
 						"Rotation": {
-							"x": 0.2827,
-							"y": 0.9646,
-							"z": -0.0
+							"x": 0.6728,
+							"y": 2.8553,
+							"z": 0.0
 						},
 						"Scale": {
 							"x": 1.0,
@@ -46,7 +46,7 @@
 					},
 					"Camera": {
 						"ZFar": 50000.0,
-						"ZNear": 0.1001
+						"ZNear": 0.1002
 					}
 				}
 			},
@@ -58,7 +58,7 @@
 						"Position": {
 							"x": -7.057,
 							"y": 7.3668,
-							"z": -1.703
+							"z": -1.7029
 						},
 						"Rotation": {
 							"x": 1.5708,
@@ -82,6 +82,47 @@
 						"Path": "assets/seville_city/seville_city.scn"
 					}
 				}
+			},
+			"Node": {
+				"Uid": 4,
+				"Name": "Light",
+				"Components": {
+					"Transform": {
+						"Position": {
+							"x": 0.0,
+							"y": 5.1228,
+							"z": 0.0
+						},
+						"Rotation": {
+							"x": 0.4681,
+							"y": 0.8702,
+							"z": 0.4912
+						},
+						"Scale": {
+							"x": 1.0,
+							"y": 1.0,
+							"z": 1.0
+						}
+					},
+					"Light": {
+						"Model": "Linear",
+						"Shadow": "ShadowMap",
+						"ShadowRange": 150.0
+					}
+				}
+			},
+			"Node": {
+				"Uid": 5,
+				"Name": "spawn_point",
+				"Components": {
+					"Transform": {
+						"Position": {
+							"x": 0.0,
+							"y": 3.9928,
+							"z": 0.0
+						}
+					}
+				}
 			}
 		},
 		"NodeHierarchy": {},

diff --git a/app/assets/seville_city/Material #12.mat b/app/assets/seville_city/Material #12.mat
@@ -0,0 +1,32 @@
+{
+	"Material": {
+		"Shader": "@core/surfaces/diffuse.isl",
+		"MaterialValues": {
+			"Value": {
+				"Name": "diffuse_color",
+				"Type": "vec4",
+				"Value": "vec4(0.588000, 0.588000, 0.588000, 1.000000)"
+			},
+			"Value": {
+				"Name": "specular_color",
+				"Type": "vec4",
+				"Value": "vec4(0.000000, 0.000000, 0.000000, 1.000000)"
+			},
+			"Value": {
+				"Name": "self_color",
+				"Type": "vec4",
+				"Value": "vec4(0.000000, 0.000000, 0.000000, 1.000000)"
+			},
+			"Value": {
+				"Name": "glossiness",
+				"Type": "float",
+				"Value": "0.031250"
+			},
+			"Value": {
+				"Name": "reflection",
+				"Type": "float",
+				"Value": "1.000000"
+			}
+		}
+	}
+}
diff --git a/app/assets/seville_city/grass.mat b/app/assets/seville_city/grass.mat
@@ -0,0 +1,32 @@
+{
+	"Material": {
+		"Shader": "@core/surfaces/diffuse.isl",
+		"MaterialValues": {
+			"Value": {
+				"Name": "diffuse_color",
+				"Type": "vec4",
+				"Value": "vec4(0.113725, 0.380392, 0.294118, 1.000000)"
+			},
+			"Value": {
+				"Name": "specular_color",
+				"Type": "vec4",
+				"Value": "vec4(0.000000, 0.000000, 0.000000, 1.000000)"
+			},
+			"Value": {
+				"Name": "self_color",
+				"Type": "vec4",
+				"Value": "vec4(0.000000, 0.000000, 0.000000, 1.000000)"
+			},
+			"Value": {
+				"Name": "glossiness",
+				"Type": "float",
+				"Value": "0.031250"
+			},
+			"Value": {
+				"Name": "reflection",
+				"Type": "float",
+				"Value": "1.000000"
+			}
+		}
+	}
+}
diff --git a/app/assets/seville_city/house_029.geo b/app/assets/seville_city/house_029.geo
diff --git a/app/assets/seville_city/house_030.geo b/app/assets/seville_city/house_030.geo
diff --git a/app/assets/seville_city/house_031.geo b/app/assets/seville_city/house_031.geo
diff --git a/app/assets/seville_city/house_26.geo b/app/assets/seville_city/house_26.geo
diff --git a/app/assets/seville_city/house_27.geo b/app/assets/seville_city/house_27.geo
diff --git a/app/assets/seville_city/maibox.geo b/app/assets/seville_city/maibox.geo
diff --git a/app/assets/seville_city/map.geo b/app/assets/seville_city/map.geo
diff --git a/app/assets/seville_city/road.mat b/app/assets/seville_city/road.mat
@@ -0,0 +1,32 @@
+{
+	"Material": {
+		"Shader": "@core/surfaces/diffuse.isl",
+		"MaterialValues": {
+			"Value": {
+				"Name": "diffuse_color",
+				"Type": "vec4",
+				"Value": "vec4(0.388235, 0.388235, 0.388235, 1.000000)"
+			},
+			"Value": {
+				"Name": "specular_color",
+				"Type": "vec4",
+				"Value": "vec4(0.000000, 0.000000, 0.000000, 1.000000)"
+			},
+			"Value": {
+				"Name": "self_color",
+				"Type": "vec4",
+				"Value": "vec4(0.000000, 0.000000, 0.000000, 1.000000)"
+			},
+			"Value": {
+				"Name": "glossiness",
+				"Type": "float",
+				"Value": "0.031250"
+			},
+			"Value": {
+				"Name": "reflection",
+				"Type": "float",
+				"Value": "1.000000"
+			}
+		}
+	}
+}