Browse Source

More Attribute/Object End nesting fixes

Matt Pharr 1 year ago
parent
commit
f8357226b1

+ 2 - 2
barcelona-pavilion/geometry.pbrt

@@ -219,8 +219,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 
 AttributeBegin
@@ -353,8 +353,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
 Translate 40 0 0

+ 1 - 1
buddha-fractal/geometry.pbrt

@@ -5,8 +5,8 @@ AttributeBegin
         NamedMaterial "Buda"
         Shape "plymesh" "string filename" "geometry/buddha.ply" 
     AttributeEnd
+    ObjectEnd
 AttributeEnd
-ObjectEnd
 
 AttributeBegin
     Transform [ 1 0 0 0 0 1 0 0 0 0 1 0 11.5665998 2.08030009 28.5746002 1  ]

+ 61 - 61
ecosys/geometry.pbrt

@@ -8,8 +8,8 @@ AttributeBegin
         Material "matte" 
                 "texture Kd" [ "apple-bark" ] 
         Shape "plymesh" "string filename" "geometry/mesh_00003.ply" 
-    AttributeEnd
     ObjectEnd
+    AttributeEnd
 
     AttributeBegin
         Translate 41.9354897 6.45161295 0.594860971
@@ -44,8 +44,8 @@ AttributeBegin
             "texture Kd" [ "bush-color-2" ] 
             "texture Ks" [ "bush-color-ks" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00005.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BUSH11"
@@ -56,8 +56,8 @@ AttributeBegin
             "texture Kd" [ "bush-color-2" ] 
             "texture Ks" [ "bush-color-ks" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00007.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BUSH12"
@@ -68,8 +68,8 @@ AttributeBegin
             "texture Kd" [ "bush-color-2" ] 
             "texture Ks" [ "bush-color-ks" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00009.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BUSH13"
@@ -80,8 +80,8 @@ AttributeBegin
             "texture Kd" [ "bush-color-2" ] 
             "texture Ks" [ "bush-color-ks" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00011.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BUSH14"
@@ -92,8 +92,8 @@ AttributeBegin
             "texture Kd" [ "bush-color-2" ] 
             "texture Ks" [ "bush-color-ks" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00013.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BUSH15"
@@ -104,8 +104,8 @@ AttributeBegin
             "texture Kd" [ "bush-color-2" ] 
             "texture Ks" [ "bush-color-ks" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00015.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BUSH16"
@@ -116,8 +116,8 @@ AttributeBegin
             "texture Kd" [ "bush-color-2" ] 
             "texture Ks" [ "bush-color-ks" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00017.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BUSH17"
@@ -128,8 +128,8 @@ AttributeBegin
             "texture Kd" [ "bush-color-2" ] 
             "texture Ks" [ "bush-color-ks" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00019.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BUSH18"
@@ -140,8 +140,8 @@ AttributeBegin
             "texture Kd" [ "bush-color-2" ] 
             "texture Ks" [ "bush-color-ks" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00021.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BUSH19"
@@ -152,8 +152,8 @@ AttributeBegin
             "texture Kd" [ "bush-color-2" ] 
             "texture Ks" [ "bush-color-ks" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00023.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     Material "BUSH1" 
@@ -1010,8 +1010,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "dandelion-stem-1" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00026.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "DANDELION11"
@@ -1024,8 +1024,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "dandelion-stem-1" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00029.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "DANDELION12"
@@ -1038,8 +1038,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "dandelion-stem-1" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00032.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "DANDELION13"
@@ -1052,8 +1052,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "dandelion-stem-1" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00035.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "DANDELION14"
@@ -1066,8 +1066,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "dandelion-stem-1" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00038.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "DANDELION15"
@@ -1080,8 +1080,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "dandelion-stem-1" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00041.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "DANDELION16"
@@ -1094,8 +1094,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "dandelion-stem-1" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00044.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "DANDELION17"
@@ -1108,8 +1108,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "dandelion-stem-1" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00047.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "DANDELION18"
@@ -1122,8 +1122,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "dandelion-stem-1" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00050.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "DANDELION19"
@@ -1136,8 +1136,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "dandelion-stem-1" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00053.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     Material "DANDELION1" 
@@ -2057,8 +2057,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00056.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS11"
@@ -2074,8 +2074,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00059.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS12"
@@ -2091,8 +2091,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00062.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS13"
@@ -2108,8 +2108,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00065.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS14"
@@ -2125,8 +2125,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00068.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS15"
@@ -2142,8 +2142,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00071.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS1"
@@ -2159,8 +2159,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00074.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS2"
@@ -2176,8 +2176,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00077.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS3"
@@ -2193,8 +2193,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00080.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS4"
@@ -2210,8 +2210,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00083.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS5"
@@ -2227,8 +2227,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00086.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS6"
@@ -2244,8 +2244,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00089.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS7"
@@ -2261,8 +2261,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00092.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS8"
@@ -2278,8 +2278,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00095.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "GRASS9"
@@ -2295,8 +2295,8 @@ AttributeBegin
             "texture Kd" [ "grass-3" ] 
             "texture Ks" [ "grass-specular" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00098.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     Material "GRASS" 
@@ -17603,8 +17603,8 @@ AttributeBegin
             "texture Kd" [ "urtica-3" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00101.ply" 
             "texture alpha" [ "urtica-3-alpha" ] 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "URTICADIOICA1"
@@ -17619,8 +17619,8 @@ AttributeBegin
             "texture Kd" [ "urtica-3" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00104.ply" 
             "texture alpha" [ "urtica-3-alpha" ] 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "URTICADIOICA2"
@@ -17635,8 +17635,8 @@ AttributeBegin
             "texture Kd" [ "urtica-3" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00107.ply" 
             "texture alpha" [ "urtica-3-alpha" ] 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "URTICADIOICA3"
@@ -17651,8 +17651,8 @@ AttributeBegin
             "texture Kd" [ "urtica-3" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00110.ply" 
             "texture alpha" [ "urtica-3-alpha" ] 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "URTICADIOICA4"
@@ -17667,8 +17667,8 @@ AttributeBegin
             "texture Kd" [ "urtica-3" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00113.ply" 
             "texture alpha" [ "urtica-3-alpha" ] 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "URTICADIOICA5"
@@ -17683,8 +17683,8 @@ AttributeBegin
             "texture Kd" [ "urtica-3" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00116.ply" 
             "texture alpha" [ "urtica-3-alpha" ] 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "URTICADIOICA6"
@@ -17699,8 +17699,8 @@ AttributeBegin
             "texture Kd" [ "urtica-3" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00119.ply" 
             "texture alpha" [ "urtica-3-alpha" ] 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "URTICADIOICA7"
@@ -17715,8 +17715,8 @@ AttributeBegin
             "texture Kd" [ "urtica-3" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00122.ply" 
             "texture alpha" [ "urtica-3-alpha" ] 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "URTICADIOICA8"
@@ -17731,8 +17731,8 @@ AttributeBegin
             "texture Kd" [ "urtica-3" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00125.ply" 
             "texture alpha" [ "urtica-3-alpha" ] 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "URTICADIOICA9"
@@ -17747,8 +17747,8 @@ AttributeBegin
             "texture Kd" [ "urtica-3" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00128.ply" 
             "texture alpha" [ "urtica-3-alpha" ] 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     Material "URTICADIOICA" 
@@ -20420,8 +20420,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00130.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER11"
@@ -20431,8 +20431,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00132.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER12"
@@ -20442,8 +20442,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00134.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER13"
@@ -20453,8 +20453,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00136.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER14"
@@ -20464,8 +20464,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00138.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER15"
@@ -20475,8 +20475,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00140.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER1"
@@ -20486,8 +20486,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00142.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER2"
@@ -20497,8 +20497,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00144.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER3"
@@ -20508,8 +20508,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00146.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER4"
@@ -20519,8 +20519,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00148.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER5"
@@ -20530,8 +20530,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00150.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER6"
@@ -20541,8 +20541,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00152.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER7"
@@ -20552,8 +20552,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00154.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER8"
@@ -20563,8 +20563,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00156.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "YELLOWFLOWER9"
@@ -20574,8 +20574,8 @@ AttributeBegin
     Material "matte" 
             "texture Kd" [ "yellowflower-2" ] 
     Shape "plymesh" "string filename" "geometry/mesh_00158.ply" 
-AttributeEnd
 ObjectEnd
+eeAttributeEnd
 
 AttributeBegin
     Material "YELLOWFLOWER" 

+ 32 - 32
landscape/geometry.pbrt

@@ -120,8 +120,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Corndog_grass_variant5b"
@@ -302,8 +302,8 @@ AttributeBegin
             Shape "plymesh" "string filename" "geometry/mesh_00014.ply" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Corndog_grass_variant4b"
@@ -483,8 +483,8 @@ AttributeBegin
             Shape "plymesh" "string filename" "geometry/mesh_00022.ply" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "meadow_v2"
@@ -953,8 +953,8 @@ AttributeBegin
                     "texture shadowalpha" "meadow_oldgrass01_alpha" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "meadow_v4"
@@ -1381,8 +1381,8 @@ AttributeBegin
                     "texture shadowalpha" "Plantago_lanc_lf_02_alpha" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Brennnessel"
@@ -1530,8 +1530,8 @@ AttributeBegin
                     "texture shadowalpha" "brennnessel_leaf4_alpha" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_Betula_pendula_03mediumb.c4d"
@@ -1752,8 +1752,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "mountain_ash"
@@ -1867,8 +1867,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_Tilia_tomentosa_02medium.c4d Instance.1"
@@ -2000,8 +2000,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_Aesculus_02medium.c4d Instance.1"
@@ -2536,8 +2536,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_Tilia_tomentosa_02medium.c4d Instance"
@@ -2669,8 +2669,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_Aesculus_02medium.c4d Instance"
@@ -3205,8 +3205,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Abies_concolor_02medium Instance"
@@ -3329,8 +3329,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Abies_concolor_01medium Instance"
@@ -3453,8 +3453,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_Tilia_tomentosa_02medium.c4d Instance"
@@ -3586,8 +3586,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_Aesculus_02medium.c4d Instance"
@@ -4122,8 +4122,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_Aesculus_02adult.c4d Instance"
@@ -4301,13 +4301,13 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Brennnessel Instance.4"
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_Picea_5mt.c4d"
@@ -4501,13 +4501,13 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_Picea_5mt.c4d Instance"
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_Aesculus_02adultb.c4d"
@@ -4682,8 +4682,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Abies_concolor_02medium"
@@ -4803,8 +4803,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_Picea_20mt.c4d"
@@ -5117,8 +5117,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "xref_WPR.c4d"
@@ -5545,8 +5545,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "meadow_v3dry"
@@ -5707,8 +5707,8 @@ AttributeBegin
             Shape "plymesh" "string filename" "geometry/mesh_00187.ply" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "meadow_v5c"
@@ -5995,8 +5995,8 @@ AttributeBegin
                     "texture shadowalpha" "meadow_grass3_blos2_alpha" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "meadow_v5b"
@@ -6387,8 +6387,8 @@ AttributeBegin
                     "texture shadowalpha" "meadow_grass3_blos2_alpha" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "meadow_v5"
@@ -6999,8 +6999,8 @@ AttributeBegin
                     "texture shadowalpha" "meadow_grass3_blos2_alpha" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "meadow_v1"
@@ -7555,8 +7555,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "meadow_v3"
@@ -7740,8 +7740,8 @@ AttributeBegin
             Shape "plymesh" "string filename" "geometry/mesh_00258.ply" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Short_mowed_large_variant1"
@@ -7839,8 +7839,8 @@ AttributeBegin
                 "texture alpha" "meadow_grass2_leaf1_alpha" 
                 "texture shadowalpha" "meadow_grass2_leaf1_alpha" 
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "wicken"
@@ -8090,8 +8090,8 @@ AttributeBegin
             Shape "plymesh" "string filename" "geometry/mesh_00270.ply" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
 AttributeEnd

+ 3 - 3
transparent-machines/frame1266.pbrt

@@ -927,8 +927,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "hugebrack 0"
@@ -2198,8 +2198,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BOLT.1"
@@ -2219,8 +2219,8 @@ AttributeBegin
             Shape "plymesh" "string filename" "geometry/1266/mesh_00129.ply" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     # ///// BEEPLE-CRAP.COM  /////

+ 3 - 3
transparent-machines/frame542.pbrt

@@ -815,8 +815,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "hugebrack 0"
@@ -1924,8 +1924,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BOLT.1"
@@ -1945,8 +1945,8 @@ AttributeBegin
             Shape "plymesh" "string filename" "geometry/542/mesh_00002.ply" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     # ///// BEEPLE-CRAP.COM  /////

+ 3 - 3
transparent-machines/frame675.pbrt

@@ -815,8 +815,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "hugebrack 0"
@@ -1946,8 +1946,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BOLT.1"
@@ -1967,8 +1967,8 @@ AttributeBegin
             Shape "plymesh" "string filename" "geometry/675/mesh_00012.ply" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     # ///// BEEPLE-CRAP.COM  /////

+ 3 - 3
transparent-machines/frame812.pbrt

@@ -816,8 +816,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "hugebrack 0"
@@ -2087,8 +2087,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BOLT.1"
@@ -2108,8 +2108,8 @@ AttributeBegin
             Shape "plymesh" "string filename" "geometry/812/mesh_00073.ply" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     # ///// BEEPLE-CRAP.COM  /////

+ 3 - 3
transparent-machines/frame888.pbrt

@@ -816,8 +816,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "hugebrack 0"
@@ -2087,8 +2087,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "BOLT.1"
@@ -2108,8 +2108,8 @@ AttributeBegin
             Shape "plymesh" "string filename" "geometry/888/mesh_00073.ply" 
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     # ///// BEEPLE-CRAP.COM  /////

+ 14 - 14
villa/geometry.pbrt

@@ -3,15 +3,15 @@ AttributeBegin
     ObjectBegin "ASSISE (2).001"
     NamedMaterial "AssiseLem"
     Shape "plymesh" "string filename" "geometry/mesh_00001.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "unnamed_obj_0"
     NamedMaterial "grass_patch"
     Shape "plymesh" "string filename" "geometry/mesh_00002.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "plan_definitif.001"
@@ -23,8 +23,8 @@ AttributeBegin
     Shape "plymesh" "string filename" "geometry/mesh_00005.ply" 
     NamedMaterial "MATELAS"
     Shape "plymesh" "string filename" "geometry/mesh_00006.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Plane.023"
@@ -36,15 +36,15 @@ AttributeBegin
     Shape "plymesh" "string filename" "geometry/mesh_00009.ply" 
     NamedMaterial "LameTerrasse"
     Shape "plymesh" "string filename" "geometry/mesh_00010.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Plane.027"
     NamedMaterial "INOX"
     Shape "plymesh" "string filename" "geometry/mesh_00011.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Plane.028"
@@ -56,8 +56,8 @@ AttributeBegin
     Shape "plymesh" "string filename" "geometry/mesh_00014.ply" 
     NamedMaterial "LameTerrasse"
     Shape "plymesh" "string filename" "geometry/mesh_00015.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "plan_definitif.017"
@@ -69,44 +69,44 @@ AttributeBegin
     Shape "plymesh" "string filename" "geometry/mesh_00018.ply" 
     NamedMaterial "MATELAS"
     Shape "plymesh" "string filename" "geometry/mesh_00019.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Cylinder.004"
     NamedMaterial "StoreFicelle"
     Shape "plymesh" "string filename" "geometry/mesh_00020.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Cylinder.005"
     NamedMaterial "StoreFicelle"
     Shape "plymesh" "string filename" "geometry/mesh_00021.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Cylinder.006"
     NamedMaterial "StoreFicelle"
     Shape "plymesh" "string filename" "geometry/mesh_00022.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Cylinder.007"
     NamedMaterial "StoreFicelle"
     Shape "plymesh" "string filename" "geometry/mesh_00023.ply" 
     Shape "plymesh" "string filename" "geometry/mesh_00024.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Cylinder.003"
     NamedMaterial "StoreFicelle"
     Shape "plymesh" "string filename" "geometry/mesh_00025.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "plan_definitif"
@@ -118,15 +118,15 @@ AttributeBegin
     Shape "plymesh" "string filename" "geometry/mesh_00028.ply" 
     NamedMaterial "MATELAS"
     Shape "plymesh" "string filename" "geometry/mesh_00029.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "unnamed_obj_0.001"
     NamedMaterial "grass_patch"
     Shape "plymesh" "string filename" "geometry/mesh_00030.ply" 
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     Transform [ -0.0000000437 -1.0000000000 0.0000000000 0.0000000000 1.0000000000 -0.0000000437 0.0000000000 0.0000000000 0.0000000000 0.0000000000 1.0000000000 0.0000000000 10.3253135681 3.7992696762 6.5470705032 1.0000000000  ]

+ 4 - 4
vw-van/vw-van.pbrt

@@ -134,8 +134,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Null.60"
@@ -209,8 +209,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Null.60"
@@ -284,8 +284,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     ObjectBegin "Null.60"
@@ -359,8 +359,8 @@ AttributeBegin
             AttributeEnd
         AttributeEnd
     AttributeEnd
-AttributeEnd
 ObjectEnd
+AttributeEnd
 
 AttributeBegin
     # -- Model by Mark Hodsman --