Merge branch 'master' into autobuild/alpha

Author: c-lipka

.gitignore

@@ -221,9 +221,25 @@ $RECYCLE.BIN/
 # Files created by make in various subdirectories
 .dirstamp
 
+# =====================
+# POV-Ray Miscellaneous
+# =====================
+
+/internal/
+/legacy-license/
+
 # =========================
 # POV-Ray Doxygen artefacts
 # =========================
 
 /tools/doxygen-warnings.log
 /tools/doxygen/source-doc/
+
+# ==========================
+# POV-Ray HTMLHelp artefacts
+# ==========================
+
+/tools/windows/htmlhelp/input
+/tools/windows/htmlhelp/output
+/tools/windows/htmlhelp/debug.txt
+/tools/windows/htmlhelp/flielist.txt

README.md

@@ -1,28 +1,11 @@
 [POV-Ray](http://www.povray.org/) - The Persistence of Vision Raytracer
 =======================================================================
 
-This document is a WIP
---------------------------------------
-
-This document is still a work in progress. While the POV-Ray project itself
-has existed for more than 20 years, this is the first time we have done a
-release on github, so please bear with us - it's a little bare at the moment.
-
-Last edit: 2016-10-09
-
-Build Status
---------------------------------------
-
-We're constantly monitoring the code quality of (almost) all branches and pull requests,
-to make sure the code builds ok on our major target platforms. The current status of
-our _master branch_ is reported as follows:
-
-  - [![Build status](https://ci.appveyor.com/api/projects/status/5953wf13f9soyw23/branch/master?svg=true)](https://ci.appveyor.com/project/c-lipka/povray-exwy4)
-    (AppVeyor: Windows Server 2012 with Visual Studio 2015)
-  - [![Build Status](https://semaphoreci.com/api/v1/pov-ray/povray/branches/master/shields_badge.svg)](https://semaphoreci.com/pov-ray/povray)
-    (Semaphore: Ubuntu 14.04 LTE 64-bit with gcc 4.8)
-  - [![Build Status](https://travis-ci.org/POV-Ray/povray.svg?branch=master)](https://travis-ci.org/POV-Ray/povray)
-    (Travis CI: Ubuntu 12.04 LTE 64-bit with gcc 4.6; OS X 10.11 with clang 4.2)
+[![Semaphore Build Status](https://semaphoreci.com/api/v1/pov-ray/povray/branches/master/shields_badge.svg?label=Semaphore)](https://semaphoreci.com/pov-ray/povray  "Semaphore: Ubuntu 14.04 LTE 64-bit with gcc 4.8")
+[![AppVeyor Build status](https://img.shields.io/appveyor/ci/c-lipka/povray-exwy4.svg?label=appveyor)](https://ci.appveyor.com/project/c-lipka/povray-exwy4 "AppVeyor: Windows Server 2012 with Visual Studio 2015")
+[![Travis CI Build Status](https://img.shields.io/travis/POV-Ray/povray.svg?label=travis ci)](https://travis-ci.org/POV-Ray/povray "Travis CI: Ubuntu 12.04 LTE 64-bit with gcc 4.6; OS X 10.11 with clang 4.2")
+[![Coverity Code Analysis](https://scan.coverity.com/projects/269/badge.svg)]( "Coverity: Static Code Analysis")
+[![Maintenance Status](https://img.shields.io/maintenance/yes/2016.svg)]( "Last edited 2016-12-20")
 
 License
 --------------------------------------
@@ -59,6 +42,9 @@ At this point in time, the only platform for which the project distributes pre-b
 obtained via http://www.povray.org/download/. We do intend to provide Mac OS X
 binaries shortly, but these will be console-mode only (based on the unix build).
 
+Official Windows binaries of selected development versions are made availabe at
+https://github.com/POV-Ray/povray/projects on a semi-irregular basis.
+
 Building POV-Ray
 --------------------------------------
 
@@ -118,9 +104,9 @@ of POV-Ray come with documentation. For the Unix build, this is in the form of a
 manpage giving basic usage, and full HTML-based documentation. For the Windows
 version, there is a HtmlHelp (.CHM) file provided.
 
-The official location for the online documentation is http://www.povray.org/documentation/,
-however please be aware that at the time of writing this still has the version 3.6 docs.
-This will be updated shortly.
+The official location for the online documentation is http://www.povray.org/documentation/.
+Further information, as well as online documentation for the current development
+version, can be found at http://wiki.povray.org.
 
 Contacting Us
 --------------------------------------

appveyor.yml

@@ -37,16 +37,6 @@ before_build:
 - ps: |
     $env:devenv = $env:VS140COMNTOOLS + '\..\IDE\devenv'
     & $env:devenv windows\vs10\povray.sln /upgrade
-    $env:pov_autobuild_a = '#define POV_RAY_IS_AUTOBUILD 1'
-    $env:pov_autobuild_b = '#define POV_RAY_AUTOBUILD_ID "av' + $env:APPVEYOR_BUILD_NUMBER + '"'
-    (Get-Content source\base\build.h).replace('//{POV_AUTOBUILD_A}', $env:pov_autobuild_a) | Set-Content source\base\build.h
-    (Get-Content source\base\build.h).replace('//{POV_AUTOBUILD_B}', $env:pov_autobuild_b) | Set-Content source\base\build.h
-    (Get-Content source\base\build.h).replace('//{POV_AUTOBUILD_C}', $env:pov_autobuild_c) | Set-Content source\base\build.h
-    (Get-Content source\base\build.h).replace('//{POV_AUTOBUILD_1}', $env:pov_autobuild_1) | Set-Content source\base\build.h
-    (Get-Content source\base\build.h).replace('//{POV_AUTOBUILD_2}', $env:pov_autobuild_2) | Set-Content source\base\build.h
-    (Get-Content source\base\build.h).replace('//{POV_AUTOBUILD_3}', $env:pov_autobuild_3) | Set-Content source\base\build.h
-    (Get-Content source\base\build.h).replace('YOUR NAME (YOUR EMAIL)', $env:pov_authorized_by) | Set-Content source\base\build.h
-    (Get-Content source\base\build.h).replace('#error "Please fill in BUILT_BY, then remove this line"', '') | Set-Content source\base\build.h
 
 build:
   project: windows/vs10/povray.sln

changes.txt

@@ -40,11 +40,9 @@ rests on a 3rd party OS X front-end that we strive to adopt.
 To Do
 -----
 
-Prior to the release of 3.7.1, the following items still need urgent attention:
+Prior to the release of 3.7.1, the following items still need some attention:
 
-  - The new features need to be properly documented.
-
-  - The Windows version's inbuilt help index needs to be fixed.
+  - Some of the new features still need to be properly documented.
 
 New Features
 ------------
@@ -72,8 +70,8 @@ Materials:
   - Colour and pigment maps now support non-linear interpolation to achieve more
     pleasing gradients.
 
-  - Fresnel angle-dependent attenuation can now also be applied to highlights
-    and the diffuse component for more physical realism.
+  - Fresnel angle-dependent attenuation can now also be applied to highlights as
+    well as diffuse and emission components for more physical realism.
 
 Geometric Primitives:
 
@@ -267,6 +265,7 @@ Reported via GitHub:
   - #153 ("vector list trailing comma error sor lathe sphere_sweep")
   - #160 ("Port of FS259 - Stack Overflow with the write-directive with missing closing bracket.")
   - #161 ("Missing parenthesis on write directive causes crash.")
+  - #175 ("Coredump due recent 3.7.1 parser updates. ")
 
 Reported via FlySpray:
 

distribution/scenes/textures/finishes/finish_fresnel.pov

@@ -0,0 +1,70 @@
+// This work is licensed under the Creative Commons Attribution 3.0 Unported License.
+// To view a copy of this license, visit http://creativecommons.org/licenses/by/3.0/
+// or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View,
+// California, 94041, USA.
+
+// Persistence Of Vision raytracer sample file.
+// This file demonstrates the effect of the "fresnel" keyword in the finish block.
+//
+// -w320 -h240
+// -w800 -h600 +a0.3
+
+#version 3.71;
+
+#declare FRESNEL = off;
+
+global_settings {
+  assumed_gamma 1.0
+  radiosity {
+    pretrace_start 0.1
+    pretrace_end 0.001
+    count 1600
+    maximum_reuse 0.1
+  }
+}
+
+#default{ finish{ ambient 0.1 diffuse 0.9 }} 
+
+camera {
+  perspective angle 75
+  location <0, 1.5,-3>
+  right    x*image_width/image_height
+  look_at  <0,1,0>
+}
+
+light_source {
+  <-3000,3000,-3000> color rgb 0.01
+}
+
+plane{ <0,1,0>, 0 
+  pigment{ checker color rgb 1 color rgb 0 }
+  finish { diffuse albedo 1 }
+  rotate y*45
+}
+
+#macro SampleSphere(P,R,C)
+  sphere { P+y*R,R
+    pigment { color C }
+    finish {
+      ambient 0
+      emission 1
+      fresnel FRESNEL
+      phong 0
+      #if (FRESNEL)
+        diffuse albedo 1
+        specular albedo 1 roughness 0.001
+        reflection FRESNEL
+      #else
+        diffuse albedo 0.5
+        specular albedo 0.5 roughness 0.001
+        reflection { 1 fresnel on }
+      #end
+    }
+    interior { ior 1.7 }
+  }
+#end
+
+
+SampleSphere(<0,0,0>,1,rgb<1,0.8,0.3>)
+SampleSphere(<2,0,2>,1,rgb<0.3,0.8,1.0>)
+SampleSphere(<-2,0,2>,1,rgb<0.3,1.0,0.3>)

platform/windows/syspovtask.cpp

@@ -58,27 +58,19 @@ void WinMemThreadCleanup();
 namespace vfePlatform
 {
 
-// implemented in `vfe/win/cpuinfo.cpp`
-// TODO - Move the implementation into `platform/windows` somewhere.
-extern bool GetCPUCount(unsigned int *TotAvailLogical, unsigned int *TotAvailCore, unsigned int *PhysicalNum);
-
 // TODO - Maybe move this somewhere else as well.
-static int GetNumberofCPUs (void)
+static unsigned int GetNumberofCPUs (void)
 {
-    unsigned    logical;
-    unsigned    cores;
-    unsigned    physical;
-    SYSTEM_INFO sysinfo;
-    static int  result = -1;
+    SYSTEM_INFO         sysinfo;
+    static unsigned int result = 0;
 
     // we cache the result, since this function is called on each thread startup
-    if (result != -1)
+    // TODO - this isn't ideal on systems with hot-pluggable CPUs
+    if (result != 0)
       return result;
 
     GetSystemInfo (&sysinfo) ;
     result = sysinfo.dwNumberOfProcessors;
-    if (GetCPUCount(&logical, &cores, &physical))
-        result = cores;
     return result;
 }
 
@@ -98,9 +90,11 @@ using namespace vfePlatform;
 void Task::Initialize ()
 {
     // NB This is not thread-safe, but we currently don't care.
-    static volatile int count = 0;
-    if (GetNumberofCPUs() > 1)
-        SetThreadIdealProcessor (GetCurrentThread(), (count++ % GetNumberofCPUs()) + 1);
+    static volatile unsigned int count = 0;
+    unsigned int numCPUs = GetNumberofCPUs();
+    // TODO - if numCPUs > 64, we need to do more than this
+    if (numCPUs > 1)
+        SetThreadIdealProcessor (GetCurrentThread(), (count++) % numCPUs);
 #ifndef _CONSOLE
     povwin::WinMemThreadStartup();
 #endif

revision.txt

@@ -27,9 +27,101 @@ Notes:
 ------------------------------------------------------------------------------
 
 ------------------------------------------------------------------------------
-POV-Ray v???
+POV-Ray v3.7.1-???
 ------------------------------------------------------------------------------
 
+Commit a61c792 on 2016-12-19 by Christoph Lipka
+
+    More version string related changes.
+
+Commit 1514773 on 2016-12-19 by Christoph Lipka
+
+    Update to Windows help file stylesheet.
+
+Commit 1896f8d on 2016-12-19 by Christoph Lipka
+
+    Update `version.h` to allow for build IDs in manual builds.
+
+Commit 5e09f10 on 2016-12-17 by Christoph Lipka
+
+    Add new mechanism for automated builds to inject additional defines
+    into Windows builds.
+
+Commit fbab8ad on 2016-12-17 by Christoph Lipka
+
+    Addendum to latest two commits.
+
+Commit 6b4cf74 on 2016-12-17 by Christoph Lipka
+
+    Trim down `pov_mem.*` to what's actually still used.
+
+Commit 64ff308 on 2016-12-17 by Christoph Lipka
+
+    More changes to simplify official builds, including movement of the
+    `pov_mem.*` source files.
+
+Commit c84a990 on 2016-12-17 by Christoph Lipka
+
+    Minor changes to Visual Studio projects for easier official release
+    builds.
+
+Commit f233f60 on 2016-12-17 by Christoph Lipka
+
+    Amendment to previous commit.
+
+Commit d96b54f on 2016-12-17 by Christoph Lipka
+
+    Amputated remnants of some legacy features.
+
+Commit a535aaf on 2016-12-16 by Christoph Lipka
+
+    [ci skip] Add tools for generating the Windows help file to the repo.
+
+Commit 5f89d41 on 2016-12-15 by Christoph Lipka
+
+    Update revision.txt.
+
+Commit b4d0b88 on 2016-12-15 by Christoph Lipka
+
+    Fix two recently introduced parser bugs, one of which tripped the Unix
+    build tests.
+
+Commit a04d241 on 2016-12-15 by Christoph Lipka
+
+    Update to the Git pre-commit hook.
+
+Commit 983ab18 on 2016-12-15 by Christoph Lipka
+
+    Fix some issues discovered by static code analysis.
+
+Commit f814383 on 2016-12-14 by Christoph Lipka
+
+    Improved behaviour of media with respect to large distances or high
+    densities (method 3 only).
+
+Commit 1968b7d on 2016-12-13 by Christoph Lipka
+
+    Disable bidirectional brilliance for now, due to it probably becoming
+    obsolete soon anyway.
+
+Commit e47718e on 2016-12-13 by Christoph Lipka
+
+    Canonicalize file paths in insert menu snippets and sample scenes to
+    use forward slashes.
+
+Commit 30dac78 on 2016-12-13 by Christoph Lipka
+
+    Disable Wavefront OBJ import for now, due to the syntax definitely not
+    being final.
+
+Commit e51eec7 on 2016-12-13 by Christoph Lipka
+
+    Fix GitHub issue #161 and closely related potential trouble.
+
+Commit 6671b3e on 2016-12-13 by Christoph Lipka
+
+    Update change log.
+
 Commit 2e6787a on 2016-12-12 by Christoph Lipka
 
     Address GitHub issue #160 by including round, square and angle brackets

source/backend/configbackend.h

@@ -56,13 +56,6 @@
     #define POVRAY_PLATFORM_NAME "Unknown Platform"
 #endif
 
-/// @def COMPILER_VER
-/// Compiler moniker string.
-///
-#ifndef COMPILER_VER
-    #define COMPILER_VER ".u"
-#endif
-
 /// @def POV_USE_DEFAULT_TASK_INITIALIZE
 /// Whether to use a default implementation for task thread initialization.
 ///
@@ -91,17 +84,13 @@
 /// @note
 ///     The result must be a genuine UCS2 string. UCS4/Unicode characters outside the Base Multilingual Plane
 ///     are not supported.
-/// @note
-///     It is unspecified whether the input byte sequence is null-terminated or not, and may in fact contain
-///     a sequence of null-separated strings. The result string should be null-separated accordingly.
 ///
-/// @param[in]  ts  Byte sequence to convert.
-/// @param[in]  tsl Byte sequence length.
+/// @param[in]  ts  Null-terminated byte sequence to convert.
 /// @param[out] as  Number of UCS2 characters in result.
-/// @return         Converted UCS2 character sequence, or `NULL` if conversion is not supported.
+/// @return         Converted null-terminated UCS2 character sequence, or `NULL` if conversion is not supported.
 ///
 #ifndef POV_CONVERT_TEXT_TO_UCS2
-    #define POV_CONVERT_TEXT_TO_UCS2(ts, tsl, as) (NULL)
+    #define POV_CONVERT_TEXT_TO_UCS2(ts, as) (NULL)
 #endif
 
 //******************************************************************************