Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
leozide committed Jan 15, 2018
2 parents 3039594 + 9c67174 commit c65ef9d
Show file tree
Hide file tree
Showing 672 changed files with 8,755 additions and 9,336 deletions.
30 changes: 26 additions & 4 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- -----------------------------------------------------------------------------------------------
NOTE: THIS IS NOT A QUESTIONNAIRE, but rather a collection of building blocks to help you write a
good issue report. Please discard any portions you don't understand or deem irrelevant for your type
of report, and change or add whatever you deem helpful.
good issue report. PLEASE DISCARD any portions you don't understand or deem irrelevant for your type
of report, and CHANGE OR ADD whatever you deem helpful.
------------------------------------------------------------------------------------------------ -->

### Summary
Expand All @@ -10,23 +10,31 @@ of report, and change or add whatever you deem helpful.

### Environment

<!-- Describe the environment you're using: -->
<!-- PLEASE DELETE ENTRIES if not applicable. -->
- Source code Git tag: <!-- e.g. v3.7.0.0 -->
- POV-Ray version: <!-- e.g. v3.7.1-beta.9+msvc14.win64 -->
- Operating system: <!-- e.g. Windows 10, Ubuntu 14.04 -->
- Hardware platform: <!-- e.g. x86, x86-64, ARM -->
- Compiler: <!-- e.g. Visual Studio 2015 SP2, GNU g++ 5.3 -->
- Regression from: <!-- known ok version, e.g. v3.6.2.msvc9.win64 -->


<!-- Build Problems Only ----------------------------------------------------------------------- -->
<!-- PLEASE DELETE THIS ENTIRE SECTION if reporting a non-build issue. -->

### Windows Build Settings

<!-- Describe the settings you were using to compile POV-Ray for Windows: -->
<!-- PLEASE DELETE THIS SUBSECTION for non-Windows builds. -->
- Configuration: <!-- e.g. Debug, Release, Release-SSE2 -->
- Platform: <!-- e.g. Win32, x64 -->

### Unix Build Command Sequence

<!-- Replace the following example with the actual command sequence you're using: -->
<!-- Replace the following example with the actual command sequence you're using to build POV-Ray
for Unix: -->
<!-- PLEASE DELETE THIS SUBSECTION for non-Unix/Mac builds. -->
~~~
cd unix ; prebuild.sh ; cd ..
./configure COMPILED_BY="John Doe <[email protected]>"
Expand All @@ -39,29 +47,35 @@ sudo make install
<!-- If you experience errors in `./configure`, or suspect the root cause to be in `prebuild.sh`,
copy the _complete_ output of `prebuild.sh` between the tilde lines (Otherwise, please strip this
subsection): -->
<!-- PLEASE DELETE THIS SUBSECTION for non-Unix/Mac builds or if not applicable. -->
~~~
~~~

### Unix Configure Output

<!-- Copy the complete output of `./configure` between the tilde lines: -->
<!-- PLEASE DELETE THIS SUBSECTION for non-Unix/Mac builds. -->
~~~
~~~

### Compiler/Linker Output

<!-- Copy any compiler/linker errors and other relevant messages between the tilde lines: -->
<!-- PLEASE DELETE THIS SUBSECTION for non-Unix/Mac builds. -->
~~~
~~~


<!-- Non-Build Problems Only ------------------------------------------------------------------- -->
<!-- PLEASE DELETE THIS ENTIRE SECTION if reporting a build issue. -->

### Steps to Reproduce

<!-- Describe the steps you took that led to the issue: -->
<!-- PLEASE DELETE OR ADD steps as applicable. -->
1. <!-- First step -->
2. <!-- Second step -->
3. <!-- Third step -->
<!-- ... -->

### Expected Behavior

Expand All @@ -71,35 +85,43 @@ subsection): -->

<!-- Describe what actually happened. -->


<!-- Render Problems Only ---------------------------------------------------------------------- -->
<!-- PLEASE DELETE THIS ENTIRE SECTION if reporting a non-render issue. -->

### Render Settings

<!-- Copy your INI options / command-line settings between the tilde lines: -->
<!-- PLEASE DELETE THIS SUBSECTION if not applicable. -->
~~~
~~~

### Scene

<!-- Copy a minimal sample scene between the tilde lines: -->
<!-- PLEASE DELETE THIS SUBSECTION if not applicable. -->
~~~
~~~

### Output

<!-- Copy the render output / message pane contents between the tilde lines: -->
<!-- PLEASE DELETE THIS SUBSECTION if not applicable. -->
~~~
~~~


<!-- All Problems ------------------------------------------------------------------------------ -->

### Workaround

<!-- If you have managed to work around the issue, describe that workaround here. -->
<!-- PLEASE DELETE THIS SUBSECTION if not applicable. -->

### Suggested Solution

<!-- If you have an idea how to solve the issue for good, describe it here. -->
<!-- PLEASE DELETE THIS SUBSECTION if not applicable. -->

<!-- -----------------------------------------------------------------------------------------------
NOTE: Please take a moment to PREVIEW YOUR REPORT before submitting it.
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ $RECYCLE.BIN/
/source/Makefile.in
/unix/Makefile.am
/unix/Makefile.in
/unix/config/ar-lib
/unix/config/compile
/unix/config/config.guess
/unix/config/config.sub
Expand Down
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ matrix:
compiler: clang

sudo: false
dist: trusty

addons:
apt:
Expand All @@ -31,9 +32,7 @@ addons:
- zlib1g-dev

install:
- cd unix
- ./prebuild.sh
- cd ..
- unix/prebuild.sh
- ./configure COMPILED_BY="Travis CI" --prefix="$(pwd)/build"
- make check
- make install
Expand Down
26 changes: 18 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,22 @@
[![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%20ci)](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)](https://scan.coverity.com/projects/pov-ray "Coverity: Static Code Analysis")
[![Maintenance Status](https://img.shields.io/maintenance/yes/2017.svg)](README.md "Last edited 2017-03-24")
[![Maintenance Status](https://img.shields.io/maintenance/yes/2017.svg)](README.md "Last edited 2017-08-18")

- [License](#license)
- [Forums](#forums)
- [Bug Reports](#bug-reports)
- [Offician Binaries](#official-binaries)
- [Building POV-Ray](#building-pov-ray)
- [IDE Versions](#ide-versions)
- [3D Modeller](#3d-modeller)
- [Documentation](#documentation)
- [Contacting Us](#contacting-us)

License
--------------------------------------

The source for POV-Ray v3.7 is licensed under the AGPL3. The documentation is under the
As of version v3.7, the source for POV-Ray is licensed under the AGPL3. The documentation is under the
Creative Commons Attribution-Noncommercial-ShareAlike 2.5 license, and support files such
as SDL includes, macros, sample scenes and so forth are under the Creative Commons Attribution-ShareAlike
3.0 Unported License (see each file header for the specific one).
Expand Down Expand Up @@ -43,15 +53,15 @@ 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.
https://github.com/POV-Ray/povray/releases on a semi-irregular basis.

Building POV-Ray
--------------------------------------

At this point in time we generally recommend building from the latest version of the
[3.7-stable branch](https://github.com/POV-Ray/povray/tree/3.7-stable). Alternatively,
[`latest-stable` branch](https://github.com/POV-Ray/povray/tree/latest-stable). Alternatively,
you may want to opt for a recent [tagged version](https://github.com/POV-Ray/povray/tags)
to test-drive features that have been added since the last stable release.
to test-drive features that have been added since the latest stable release.

_Please do not build directly from the master branch_ (or any other non-stable branch
for that matter), as versions from that branch may report ambiguous version numbers,
Expand All @@ -65,14 +75,14 @@ otherwise your build _will not work_), and also on Mac systems (console mode onl
an appropriately-modified version of the unix build - not currently provided by us).

If you are using an operating system with a package or ports system such as
Ubuntu or FreeBSD, you may like to check whether or not POV-Ray 3.7 is available
Ubuntu or FreeBSD, you may like to check whether or not POV-Ray is available
via that route.

IDE versions
--------------------------------------

Currently the only version of POV-Ray with an IDE as such is the Windows build.
We do want to change that, though. With the release of POV-Ray 3.7 we have added
We do want to change that, though. With the release of POV-Ray v3.7 we have added
a clear split between the backend (renderer) and frontend (UI or console), along
with a C++ layer which abstracts this into a fairly easily-understood set of
classes (VFE, aka 'Virtual Front End').
Expand All @@ -89,7 +99,7 @@ Putting it another way: we consider getting a cross-platform IDE a high priority

POV-Ray does not currently have its own 3d modelling application (at least, not one
in a usable state). We do own the rights to the Moray modeller, which was formerly
commercial, but it needs a little work to get it working with v3.7. It is also
commercial, but it needs a little work to get it working with v3.7 or later. It is also
Windows only (due to its use of MFC). Nevertheless we will be adding the source
to the repository at a future date.

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 3.7+av{build}
version: 3.8+av{build}
pull_requests:
do_not_increment_build_number: true
branches:
Expand Down
100 changes: 93 additions & 7 deletions changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Notes:
For example, to read FS#270, visit:
http://bugs.povray.org/270

(Note: As of 3.7.1-beta.8 our flyspray bug tracker is officially mothballed,
(Note: As of v3.7.1-beta.8 our flyspray bug tracker is officially mothballed,
and we no longer refer to it in the changelog. Any flyspray reports that
were still open at that point have been duplicated as GitHub issues titled
"Port of FSxxx - ...")
Expand All @@ -29,21 +29,107 @@ should be located in the same directory as this file is.
------------------------------------------------------------------------------


Changes between 3.7.1 and 3.7.2-TBD
===================================
Changes between v3.8.0 and v3.8.1-???
=====================================

This version is still under active development, and not finalized yet.

TBD


Changes between 3.7.1-TBD and 3.7.1
===================================
Changes between v3.7.1-rc.1 and v3.8.0-???
==========================================

TBD
This version is still under active development, and not finalized yet.

NOTE: This release cycle has been redesignated v3.8.0. There will not be a
v3.7.1 release proper.

Performance Improvements
------------------------

- Significantly improved parsing speed of skipped conditional blocks (e.g. in
`#if(false) ... #end`), especially for blocks containing few directives
(stuff that begins with `#`).

Changed Behaviour
-----------------

- Any new behaviour formerly activated by `#version 3.71` now requires
`#version 3.8` (or higher); specifying `#version 3.71` will trigger a
corresponding warning.
- Some defaults have been changed (requires `#version 3.8` as the _very first_
statement of the scene, or a corresponding command line / INI setting):
- The pigment now defaults to plain white.
- `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.
- Token counting in conditional blocks (e.g. in `#if ... #end`) has changed.
Whenever such a block is skipped, the token count is now incremented only
by directives (stuff that begins with `#`).

Fixed or Mitigated Bugs
-----------------------

Reported via GitHub:

- #65 ("Normal for the prism's bezier spline mode is reversed from other
spline types & lathe uses.")
- #292 ("Port of FS227 - Fixed Vector Limitations")
- #317 ("Boost 1.65.0 incompatibility")
- #341 ("macOS build failure for 3.7.0.5", configure script failing to use
-lboost_system with Boost 1.66)
- #342 ("AX_FIX_INCORRECT_PATH is broken", configure script failing to
properly handle `.` directory in `C_INCLUDE_PATH` or `CPLUS_INCLUDE_PATH`)

Reported via the Newsgroups:

- <[email protected]>
(2017-11-05, povray.newusers, "orthographic camera and conic_sweep object")
Sides of a `conic_sweep` prism become invisible when viewed head-on using
an orthographic camera.
- <[email protected]>
(2018-01-05, povray.beta-test, "3.8.0 block pattern, density list parsing issue.")

Miscellaneous:

- Fix `interior_texture` for text objects (as mentioned in GitHub issue #65)
- Eliminated use of deprecated C++ `register` keyword (except in 3rd party
libraries bundled with the POV-Ray source code).

Other Noteworthy
----------------

- The source code now requires a C++11-compliant compiler.
- The Unix build process now officially requires Autoconf 2.68 or later.
- Added `--generation` command-line switch to POV-Ray for Unix, which will
cause POV-Ray to print its abbreviated version number to standard output.
- To simplify version number housekeeping, the file `unix/VERSION` is now
created on the fly by the `unix/prebuild.sh` script, and has been dropped
from the repository. To retrieve version information from the source
package, use one of the new `get-source-version.*` scripts provided in
`tools/unix/` and `tools/windows/`, respectively.
- The `unix/prebuild.sh` script can now be run from the main directory; it is
no longer necessary to change to the unix directory first.


Changes between 3.7.1-beta.9 and 3.7.1-rc.1
===========================================

Fixed or Mitigated Bugs
-----------------------

Miscellaneous:

- Fixed a bug that broke builds without optimized noise.
- Fixed an issue in optimized noise when building on Unix with C++ compiler
switches disabling any of the relevant enhanced instruction sets (e.g.
`CXXFLAGS=-mno-fma`).


Changes between 3.7.1-beta.7 and 3.7.1-beta.9
Changes between 3.7.1-beta.8 and 3.7.1-beta.9
=============================================

Fixed or Mitigated Bugs
Expand Down
6 changes: 3 additions & 3 deletions distribution/include/ior.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a
// letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.

// Persistence of Vision Ray Tracer version 3.7 Include File
// Persistence of Vision Ray Tracer version 3.8 Include File
// File: ior.inc
// Last updated: 2015-06-24
// Last updated: 2017-07-02
// Description: This file contains constants for ior and dispersion of various materials.

#ifndef(Ior_Inc_Temp)
#declare Ior_Inc_Temp=version;
#version 3.71;
#version 3.8;

#ifdef(View_POV_Include_Stack)
#debug "including ior.inc\n"
Expand Down
2 changes: 1 addition & 1 deletion distribution/ini/allanim.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;; Persistence Of Vision Raytracer version 3.7 sample INI file.
;; Persistence Of Vision Raytracer version 3.8 sample INI file.
Fatal_Error_Command=command /C type fatal.out>>allscene.err
Fatal_File=on
-P +b100 +X100 +a0.05 +r4 -j
Expand Down
2 changes: 1 addition & 1 deletion distribution/ini/allstill.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;; Persistence Of Vision Raytracer version 3.7 sample INI file.
;; Persistence Of Vision Raytracer version 3.8 sample INI file.
Fatal_Error_Command=command /C type fatal.out>>allscene.err
User_Abort_Command=command /C Echo get out>userabor.mes
Fatal_File=on
Expand Down
2 changes: 1 addition & 1 deletion distribution/ini/low.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;; Persistence Of Vision Raytracer version 3.7 sample INI file.
;; Persistence Of Vision Raytracer version 3.8 sample INI file.
;; LOW.INI
;;
Quality=4
Expand Down
2 changes: 1 addition & 1 deletion distribution/ini/pngflc.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;; Persistence Of Vision Raytracer version 3.7 sample INI file.
;; Persistence Of Vision Raytracer version 3.8 sample INI file.
;; PNGFLC.INI
;;
;; Assuming Input_File=myfile.pov
Expand Down
2 changes: 1 addition & 1 deletion distribution/ini/pngfli.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;; Persistence Of Vision Raytracer version 3.7 sample INI file.
;; Persistence Of Vision Raytracer version 3.8 sample INI file.
;; PNGFLI.INI
;;
;; Assuming Input_File=myfile.pov
Expand Down
Loading

0 comments on commit c65ef9d

Please sign in to comment.