Skip to content

Commit 4a77d70

Browse files
c-lipkac-lipka
committed
Merge branch 'master' into autobuild/alpha
2 parents 588df5b + 3f1de0d commit 4a77d70

File tree

23 files changed

+228
-91
lines changed

23 files changed

+228
-91
lines changed

‎changes.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ Reported via GitHub:
234234
- #49 ("Latest version from Git won't build with MS Visual Studio 2015")
235235
- #50 ("Make error in Ubuntu 14.04")
236236
- #53 ("Standard include files may mess up the language version")
237+
- #114 ("Port of FS298 - The warning for isosurface does not appears as often as with 3.6.1")
237238
- #129 ("Port of FS331 - Intersection causes quadric to disappear")
238239
- #153 ("vector list trailing comma error sor lathe sphere_sweep")
239240

@@ -242,6 +243,7 @@ Reported via FlySpray:
242243
- FS#254 ("Mesh_camera type 0 output seems to be incorrect")
243244
- FS#261 ("mesh_camera distribution type 3 output image is placed 0.5 pixels to wrong")
244245
- FS#270 ("render abort-continue (+C) sometimes skips blocks")
246+
FS#298 ("the warning for isosurface does not appears as often as with 3.6.1")
245247
- FS#313 ("radiosity.cpp pov::RadiosityFunction::BeforeTile assertion failed")
246248
- FS#314 ("reading Gif is bugged in 3.7")
247249
- FS#315 ("inverse keyword does not work properly with quadrics")

‎source/backend/bounding/boundingtask.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
#include "backend/frame.h"
4343
#include "backend/bounding/boundingtask.h"
4444

45+
#include "core/bounding/bsptree.h"
4546
#include "core/math/matrix.h"
4647
#include "core/scene/object.h"
4748
#include "core/scene/tracethreaddata.h"
48-
#include "core/support/bsptree.h"
4949

5050
#include "povms/povmsid.h"
5151

‎source/backend/scene/view.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/// @parblock
99
///
1010
/// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
11-
/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.
11+
/// Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
1212
///
1313
/// POV-Ray is free software: you can redistribute it and/or modify
1414
/// it under the terms of the GNU Affero General Public License as
@@ -38,9 +38,9 @@
3838

3939
#include <vector>
4040

41+
#include "core/bounding/bsptree.h"
4142
#include "core/lighting/radiosity.h"
4243
#include "core/scene/camera.h"
43-
#include "core/support/bsptree.h"
4444

4545
#include "backend/support/taskqueue.h"
4646

‎source/base/version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262

6363
/// Prerelease identifier.
6464
/// Leave undefined for official releases.
65-
#define POV_RAY_PRERELEASE "alpha.8901709"
65+
#define POV_RAY_PRERELEASE "alpha.8913469"
6666

6767
/// @def POV_RAY_VERSION
6868
/// Full version string.

‎source/core/bounding/bounding.cpp‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
//******************************************************************************
2+
///
3+
/// @file core/bounding/bounding.cpp
4+
///
5+
/// Implementations related to bounding mechanisms.
6+
///
7+
/// @copyright
8+
/// @parblock
9+
///
10+
/// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
11+
/// Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
12+
///
13+
/// POV-Ray is free software: you can redistribute it and/or modify
14+
/// it under the terms of the GNU Affero General Public License as
15+
/// published by the Free Software Foundation, either version 3 of the
16+
/// License, or (at your option) any later version.
17+
///
18+
/// POV-Ray is distributed in the hope that it will be useful,
19+
/// but WITHOUT ANY WARRANTY; without even the implied warranty of
20+
/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+
/// GNU Affero General Public License for more details.
22+
///
23+
/// You should have received a copy of the GNU Affero General Public License
24+
/// along with this program. If not, see <http://www.gnu.org/licenses/>.
25+
///
26+
/// ----------------------------------------------------------------------------
27+
///
28+
/// POV-Ray is based on the popular DKB raytracer version 2.12.
29+
/// DKBTrace was originally written by David K. Buck.
30+
/// DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
31+
///
32+
/// @endparblock
33+
///
34+
//******************************************************************************
35+
36+
// Unit header file must be the first file included within POV-Ray *.cpp files (pulls in config)
37+
#include "core/bounding/bounding.h"
38+
39+
// this must be the last file included
40+
#include "base/povdebug.h"
41+
42+
namespace pov
43+
{
44+
45+
// nothing in here yet
46+
47+
}

‎source/core/bounding/bounding.h‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
//******************************************************************************
2+
///
3+
/// @file core/bounding/bounding.h
4+
///
5+
/// Declarations related to bounding mechanisms.
6+
///
7+
/// @copyright
8+
/// @parblock
9+
///
10+
/// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
11+
/// Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
12+
///
13+
/// POV-Ray is free software: you can redistribute it and/or modify
14+
/// it under the terms of the GNU Affero General Public License as
15+
/// published by the Free Software Foundation, either version 3 of the
16+
/// License, or (at your option) any later version.
17+
///
18+
/// POV-Ray is distributed in the hope that it will be useful,
19+
/// but WITHOUT ANY WARRANTY; without even the implied warranty of
20+
/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+
/// GNU Affero General Public License for more details.
22+
///
23+
/// You should have received a copy of the GNU Affero General Public License
24+
/// along with this program. If not, see <http://www.gnu.org/licenses/>.
25+
///
26+
/// ----------------------------------------------------------------------------
27+
///
28+
/// POV-Ray is based on the popular DKB raytracer version 2.12.
29+
/// DKBTrace was originally written by David K. Buck.
30+
/// DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
31+
///
32+
/// @endparblock
33+
///
34+
//******************************************************************************
35+
36+
#ifndef POVRAY_CORE_BOUNDING_H
37+
#define POVRAY_CORE_BOUNDING_H
38+
39+
// Module config header file must be the first file included within POV-Ray unit header files
40+
#include "core/configcore.h"
41+
42+
namespace pov
43+
{
44+
45+
//##############################################################################
46+
///
47+
/// @defgroup PovCoreBounding Bounding
48+
/// @ingroup PovCore
49+
///
50+
/// @{
51+
52+
// nothing in here yet.
53+
54+
/// @}
55+
///
56+
//##############################################################################
57+
58+
}
59+
60+
#endif // POVRAY_CORE_BOUNDING_H

‎source/core/bounding/boundingbox.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ namespace pov
4848
//##############################################################################
4949
///
5050
/// @defgroup PovCoreBoundingBox Bounding Boxes
51-
/// @ingroup PovCore
51+
/// @ingroup PovCoreBounding
5252
///
5353
/// @{
5454

‎source/core/bounding/boundingcylinder.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace pov
4747
//##############################################################################
4848
///
4949
/// @defgroup PovCoreBoundingCylinder Bounding Cylinders
50-
/// @ingroup PovCore
50+
/// @ingroup PovCoreBounding
5151
///
5252
/// @{
5353

‎source/core/bounding/boundingsphere.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace pov
4747
//##############################################################################
4848
///
4949
/// @defgroup PovCoreBoundingSphere Bounding Spheres
50-
/// @ingroup PovCore
50+
/// @ingroup PovCoreBounding
5151
///
5252
/// @{
5353

‎source/core/support/bsptree.cpp‎ renamed to ‎source/core/bounding/bsptree.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//******************************************************************************
22
///
3-
/// @file core/support/bsptree.cpp
3+
/// @file core/bounding/bsptree.cpp
44
///
55
/// @todo What's in here?
66
///
@@ -34,7 +34,7 @@
3434
//******************************************************************************
3535

3636
// Unit header file must be the first file included within POV-Ray *.cpp files (pulls in config)
37-
#include "core/support/bsptree.h"
37+
#include "core/bounding/bsptree.h"
3838

3939
#include <vector>
4040
#include <list>

0 commit comments

Comments
 (0)