Update scenes

I don't always check them when I make changes to how they are intepreted, so there were some quite old breakages in there.
vkoskiv · Nov 11, 2023 · 1444494 · 1444494
1 parent 68b8043
commit 1444494
Show file tree

Hide file tree

Showing 9 changed files with 233 additions and 481 deletions.
diff --git a/input/fence.json b/input/fence.json
@@ -133,13 +133,17 @@
 					}
 				],
 				"radius": 8,
-				"color": {
-					"r": 1.0,
-					"g": 0.0,
-					"b": 0.0
-				},
-				"bsdf": "emissive",
-				"intensity": 100.0
+				"material": [
+					{
+						"type": "emissive",
+						"color": {
+							"r": 1.0,
+							"g": 0.0,
+							"b": 0.0
+						},
+						"strength": 100.0
+					}
+				]
 			},
 			{
 				"type": "sphere",
@@ -156,13 +160,17 @@
 					}
 				],
 				"radius": 8,
-				"color": {
-					"r": 0.0,
-					"g": 1.0,
-					"b": 0.0
-				},
-				"bsdf": "emissive",
-				"intensity": 100.0
+				"material": [
+					{
+						"type": "emissive",
+						"color": {
+							"r": 0.0,
+							"g": 1.0,
+							"b": 0.0
+						},
+						"strength": 100.0
+					}
+				]
 			},
 			{
 				"type": "sphere",
@@ -179,23 +187,27 @@
 					}
 				],
 				"radius": 8,
-				"color": {
-					"r": 0.0,
-					"g": 0.0,
-					"b": 1.0
-				},
-				"bsdf": "emissive",
-				"intensity": 100.0
+				"material": [
+					{
+						"type": "emissive",
+						"color": {
+							"r": 0.0,
+							"g": 0.0,
+							"b": 1.0
+						},
+						"strength": 100.0
+					}
+				]
 			}
 		],
 		"meshes": [
 			{
-				"fileName": "newScene.obj",
-				"instances": [{}]
+				"fileName": "newScene.obj"
 			},
 			{
+				"for": "Cube.029",
 				"fileName": "fence.obj",
-				"instances": [
+				"pick_instances": [
 					{
 						"transforms": [
 							{

diff --git a/input/glowmetal.json b/input/glowmetal.json
@@ -92,7 +92,7 @@
 		"meshes": [
 			{
 				"fileName": "shapes/gridplane.obj",
-				"instances": [
+				"pick_instances": [
 					{
 						"transforms": [
 							{

diff --git a/input/hdr.json b/input/hdr.json
@@ -345,7 +345,7 @@
 						"g": 1.0,
 						"b": 0.0
 					},
-					"intensity": 10.0
+					"strength": 10.0
 				},
 				"radius": 2.5
 			},
@@ -370,7 +370,7 @@
 						"g": 0.0,
 						"b": 1.0
 					},
-					"intensity": 10.0
+					"strength": 10.0
 				},
 				"radius": 2.5
 			},
@@ -395,7 +395,7 @@
 						"g": 1.0,
 						"b": 1.0
 					},
-					"intensity": 10.0
+					"strength": 10.0
 				},
 				"radius": 10
 			}

diff --git a/input/hex.json b/input/hex.json
@@ -82,11 +82,12 @@
 		"meshes": [
 			{
 				"fileName": "shapes/gridplane.obj",
-				"instances": [
+				"pick_instances": [
 					{
 						"for": "Plane",
 						"materials": [
 							{
+								"replace": "Material.001",
 								"type": "diffuse",
 								"color": {
 									"type": "to_color",