Update benchmark scene for v3.8.

leozide · Nov 18, 2017 · bb85b4f · bb85b4f
1 parent 3dc2808
commit bb85b4f
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 35 deletions.
diff --git a/changes.txt b/changes.txt
@@ -72,6 +72,8 @@ Changed Behaviour
       - `ambient` now defaults to 0.0 instead of 0.1.
       - The camera `right` vector length now defaults to the output image aspect
         ratio (presuming square pixels) instead of 1.33.
+  - Minor changes have been made to the benchmark scene. New benchmark version
+    is 2.03.
 
 Other Noteworthy
 ----------------

diff --git a/distribution/scenes/advanced/benchmark/benchmark.ini b/distribution/scenes/advanced/benchmark/benchmark.ini
@@ -73,6 +73,6 @@ Test_Abort=Off
 User_Abort_Command=
 User_Abort_Return=I
 Verbose=On
-Version=3.7
+Version=3.8
 Warning_Console=On
 Width=512
diff --git a/distribution/scenes/advanced/benchmark/benchmark.pov b/distribution/scenes/advanced/benchmark/benchmark.pov
@@ -1,5 +1,5 @@
-// This work is licensed under the POV-Ray v3.7 distribution license.
-// To view a copy of this license, visit http://www.povray.org/licences/v3.7/.
+// This work is licensed under the POV-Ray v3.8 distribution license.
+// To view a copy of this license, visit http://www.povray.org/licences/v3.8/.
 //
 // The following exception is granted to the above license terms:
 // Permission is granted for this file and the output from it to be
@@ -13,7 +13,7 @@
 // Persistence Of Vision Ray Tracer Scene Description File
 //
 // File:            benchmark.pov
-// Benchmark Vers:  2.02 Scene File Version
+// Benchmark Vers:  2.03 Scene File Version
 // Desc:            POV-Ray benchmark scene
 // Date:            October/November 2001 (initial release)
 //
@@ -24,7 +24,7 @@
 //
 // ==================================================================
 //
-//    Standard POV-Ray benchmark version 2.02 Scene File Version
+//    Standard POV-Ray benchmark version 2.03 Scene File Version
 //
 // This is the official POV-Ray benchmark scene.  It is designed
 // to test a variety of POV-Ray features and should render in a
@@ -46,7 +46,7 @@
 // make sure the differences are made clear when publishing them.
 //
 // When publishing results, be sure to quote the exact version of the
-// benchmark scene used (2.02 Scene File Version), and the exact
+// benchmark scene used (2.03 Scene File Version), and the exact
 // version of POV-Ray.
 //
 // ==================================================================
@@ -64,6 +64,7 @@
 // Jan. 2013   change version to 2.01 to differentiate from beta.
 // Feb  2013   Updated for v3.7
 // Nov. 2017   Re-synced distribution copy with built-in copy (new ver is 2.02)
+// Nov. 2017   Updated for v3.8 (new ver is 2.03)
 //
 // ==================================================================
 //
@@ -149,15 +150,15 @@
 // User_Abort_Command=
 // User_Abort_Return=I
 // Verbose=On
-// Version=3.7
+// Version=3.8
 // Warning_Console=On
 // Width=512
 //
 // ==================================================================
 
-#version 3.7;
+#version 3.8;
 
-#default { texture { finish { ambient 0 diffuse 1 }}}
+#default { texture { finish { ambient 0.02 diffuse 1 }}}
 
 #declare use_radiosity = false;
 
@@ -202,12 +203,6 @@ global_settings {
 
 }
 
-#if (use_radiosity=false)
-   #default {finish {ambient 0.02}}
-#else
-   #default {finish {ambient 0.00}}
-#end
-
 //====================================================================================
 
 // This scene uses a non-standard camera set-up. 
@@ -398,7 +393,7 @@ sphere {           // --- Sky ---
       }
       finish {
          diffuse 0
-         ambient 1
+         emission 1
       }
    }
    scale Rad*<20, 20, 4>
@@ -732,7 +727,7 @@ text {
 #declare Version_Text =
 text {
    internal 1 // ttf "timrom.ttf"
-   "Version 3.7"
+   "Version 3.8"
    0.25,0
    scale 0.3
    rotate 90*x

diff --git a/source/backend/control/benchmark.cpp b/source/backend/control/benchmark.cpp
@@ -74,7 +74,7 @@ bool Write_Benchmark_File (const char *Scene_File_Name, const char *INI_File_Nam
 
 unsigned int Get_Benchmark_Version (void)
 {
-    return (0x0202) ; // Benchmark version 2.02
+    return (0x0203) ; // Benchmark version 2.03
 }
 
 }

diff --git a/source/backend/control/benchmark_ini.cpp b/source/backend/control/benchmark_ini.cpp
@@ -117,7 +117,7 @@ extern const char Benchmark_Options[]=
   "User_Abort_Command=\n"
   "User_Abort_Return=I\n"
   "Verbose=On\n"
-  "Version=3.7\n"
+  "Version=3.8\n"
   "Warning_Console=On\n"
   "Width=512\n"
   ""

diff --git a/source/backend/control/benchmark_pov.cpp b/source/backend/control/benchmark_pov.cpp
@@ -42,8 +42,8 @@
 namespace pov {
 
 extern const char Benchmark_File[]=
-  "// This work is licensed under the POV-Ray v3.7 distribution license.\n"
-  "// To view a copy of this license, visit http://www.povray.org/licences/v3.7/.\n"
+  "// This work is licensed under the POV-Ray v3.8 distribution license.\n"
+  "// To view a copy of this license, visit http://www.povray.org/licences/v3.8/.\n"
   "//\n"
   "// The following exception is granted to the above license terms:\n"
   "// Permission is granted for this file and the output from it to be\n"
@@ -57,7 +57,7 @@ extern const char Benchmark_File[]=
   "// Persistence Of Vision Ray Tracer Scene Description File\n"
   "//\n"
   "// File:            benchmark.pov\n"
-  "// Benchmark Vers:  2.02 Scene File Version\n"
+  "// Benchmark Vers:  2.03 Scene File Version\n"
   "// Desc:            POV-Ray benchmark scene\n"
   "// Date:            October/November 2001 (initial release)\n"
   "//\n"
@@ -68,7 +68,7 @@ extern const char Benchmark_File[]=
   "//\n"
   "// ==================================================================\n"
   "//\n"
-  "//    Standard POV-Ray benchmark version 2.02 Scene File Version\n"
+  "//    Standard POV-Ray benchmark version 2.03 Scene File Version\n"
   "//\n"
   "// This is the official POV-Ray benchmark scene.  It is designed\n"
   "// to test a variety of POV-Ray features and should render in a\n"
@@ -90,7 +90,7 @@ extern const char Benchmark_File[]=
   "// make sure the differences are made clear when publishing them.\n"
   "//\n"
   "// When publishing results, be sure to quote the exact version of the\n"
-  "// benchmark scene used (2.02 Scene File Version), and the exact\n"
+  "// benchmark scene used (2.03 Scene File Version), and the exact\n"
   "// version of POV-Ray.\n"
   "//\n"
   "// ==================================================================\n"
@@ -108,6 +108,7 @@ extern const char Benchmark_File[]=
   "// Jan. 2013   change version to 2.01 to differentiate from beta.\n"
   "// Feb  2013   Updated for v3.7\n"
   "// Nov. 2017   Re-synced distribution copy with built-in copy (new ver is 2.02)\n"
+  "// Nov. 2017   Updated for v3.8 (new ver is 2.03)\n"
   "//\n"
   "// ==================================================================\n"
   "//\n"
@@ -193,15 +194,15 @@ extern const char Benchmark_File[]=
   "// User_Abort_Command=\n"
   "// User_Abort_Return=I\n"
   "// Verbose=On\n"
-  "// Version=3.7\n"
+  "// Version=3.8\n"
   "// Warning_Console=On\n"
   "// Width=512\n"
   "//\n"
   "// ==================================================================\n"
   "\n"
-  "#version 3.7;\n"
+  "#version 3.8;\n"
   "\n"
-  "#default { texture { finish { ambient 0 diffuse 1 }}}\n"
+  "#default { texture { finish { ambient 0.02 diffuse 1 }}}\n"
   "\n"
   "#declare use_radiosity = false;\n"
   "\n"
@@ -246,12 +247,6 @@ extern const char Benchmark_File[]=
   "\n"
   "}\n"
   "\n"
-  "#if (use_radiosity=false)\n"
-  "   #default {finish {ambient 0.02}}\n"
-  "#else\n"
-  "   #default {finish {ambient 0.00}}\n"
-  "#end\n"
-  "\n"
   "//====================================================================================\n"
   "\n"
   "// This scene uses a non-standard camera set-up. \n"
@@ -442,7 +437,7 @@ extern const char Benchmark_File[]=
   "      }\n"
   "      finish {\n"
   "         diffuse 0\n"
-  "         ambient 1\n"
+  "         emission 1\n"
   "      }\n"
   "   }\n"
   "   scale Rad*<20, 20, 4>\n"
@@ -776,7 +771,7 @@ extern const char Benchmark_File[]=
   "#declare Version_Text =\n"
   "text {\n"
   "   internal 1 // ttf \"timrom.ttf\"\n"
-  "   \"Version 3.7\"\n"
+  "   \"Version 3.8\"\n"
   "   0.25,0\n"
   "   scale 0.3\n"
   "   rotate 90*x\n"

diff --git a/tools/meta-make/meta-make.sh b/tools/meta-make/meta-make.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# =============================================================================
+
 # Print header for single C++ source file.
 # $1 - output file name
 # $2 - input file name
@@ -62,10 +64,16 @@ function reswrap_benchmark {
     reswrap_text "source/backend/control/benchmark_$1" "distribution/scenes/advanced/benchmark/benchmark.$1" "pov" "$2"
 }
 
+# =============================================================================
+
+# TrueType Fonts
+
 reswrap_ttf "crystal"
 reswrap_ttf "cyrvetic"
 reswrap_ttf "povlogo"
 reswrap_ttf "timrom"
 
+# Benchmark Scene
+
 reswrap_benchmark "pov" "Benchmark_File"
 reswrap_benchmark "ini" "Benchmark_Options"
-Original file line number
+Diff line change
@@ Expand Up @@
     unsigned int Get_Benchmark_Version (void)
     {
-        return (0x0202) ; // Benchmark version 2.02
+        return (0x0203) ; // Benchmark version 2.03
     }
     }
@@ Expand Down @@