Skip to content

Commit 26ca9dc

Browse files
hollaschhollasch
committed
Apply CC0 Universal Public Domain Dedication
1 parent 9997f49 commit 26ca9dc

29 files changed

+500
-108
lines changed

‎COPYING.md

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
Creative Commons Legal Code
2+
3+
CC0 1.0 Universal
4+
5+
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
6+
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
7+
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
8+
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
9+
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
10+
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
11+
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
12+
HEREUNDER.
13+
14+
Statement of Purpose
15+
16+
The laws of most jurisdictions throughout the world automatically confer
17+
exclusive Copyright and Related Rights (defined below) upon the creator
18+
and subsequent owner(s) (each and all, an "owner") of an original work of
19+
authorship and/or a database (each, a "Work").
20+
21+
Certain owners wish to permanently relinquish those rights to a Work for
22+
the purpose of contributing to a commons of creative, cultural and
23+
scientific works ("Commons") that the public can reliably and without fear
24+
of later claims of infringement build upon, modify, incorporate in other
25+
works, reuse and redistribute as freely as possible in any form whatsoever
26+
and for any purposes, including without limitation commercial purposes.
27+
These owners may contribute to the Commons to promote the ideal of a free
28+
culture and the further production of creative, cultural and scientific
29+
works, or to gain reputation or greater distribution for their Work in
30+
part through the use and efforts of others.
31+
32+
For these and/or other purposes and motivations, and without any
33+
expectation of additional consideration or compensation, the person
34+
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
35+
is an owner of Copyright and Related Rights in the Work, voluntarily
36+
elects to apply CC0 to the Work and publicly distribute the Work under its
37+
terms, with knowledge of his or her Copyright and Related Rights in the
38+
Work and the meaning and intended legal effect of CC0 on those rights.
39+
40+
1. Copyright and Related Rights. A Work made available under CC0 may be
41+
protected by copyright and related or neighboring rights ("Copyright and
42+
Related Rights"). Copyright and Related Rights include, but are not
43+
limited to, the following:
44+
45+
i. the right to reproduce, adapt, distribute, perform, display,
46+
communicate, and translate a Work;
47+
ii. moral rights retained by the original author(s) and/or performer(s);
48+
iii. publicity and privacy rights pertaining to a person's image or
49+
likeness depicted in a Work;
50+
iv. rights protecting against unfair competition in regards to a Work,
51+
subject to the limitations in paragraph 4(a), below;
52+
v. rights protecting the extraction, dissemination, use and reuse of data
53+
in a Work;
54+
vi. database rights (such as those arising under Directive 96/9/EC of the
55+
European Parliament and of the Council of 11 March 1996 on the legal
56+
protection of databases, and under any national implementation
57+
thereof, including any amended or successor version of such
58+
directive); and
59+
vii. other similar, equivalent or corresponding rights throughout the
60+
world based on applicable law or treaty, and any national
61+
implementations thereof.
62+
63+
2. Waiver. To the greatest extent permitted by, but not in contravention
64+
of, applicable law, Affirmer hereby overtly, fully, permanently,
65+
irrevocably and unconditionally waives, abandons, and surrenders all of
66+
Affirmer's Copyright and Related Rights and associated claims and causes
67+
of action, whether now known or unknown (including existing as well as
68+
future claims and causes of action), in the Work (i) in all territories
69+
worldwide, (ii) for the maximum duration provided by applicable law or
70+
treaty (including future time extensions), (iii) in any current or future
71+
medium and for any number of copies, and (iv) for any purpose whatsoever,
72+
including without limitation commercial, advertising or promotional
73+
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
74+
member of the public at large and to the detriment of Affirmer's heirs and
75+
successors, fully intending that such Waiver shall not be subject to
76+
revocation, rescission, cancellation, termination, or any other legal or
77+
equitable action to disrupt the quiet enjoyment of the Work by the public
78+
as contemplated by Affirmer's express Statement of Purpose.
79+
80+
3. Public License Fallback. Should any part of the Waiver for any reason
81+
be judged legally invalid or ineffective under applicable law, then the
82+
Waiver shall be preserved to the maximum extent permitted taking into
83+
account Affirmer's express Statement of Purpose. In addition, to the
84+
extent the Waiver is so judged Affirmer hereby grants to each affected
85+
person a royalty-free, non transferable, non sublicensable, non exclusive,
86+
irrevocable and unconditional license to exercise Affirmer's Copyright and
87+
Related Rights in the Work (i) in all territories worldwide, (ii) for the
88+
maximum duration provided by applicable law or treaty (including future
89+
time extensions), (iii) in any current or future medium and for any number
90+
of copies, and (iv) for any purpose whatsoever, including without
91+
limitation commercial, advertising or promotional purposes (the
92+
"License"). The License shall be deemed effective as of the date CC0 was
93+
applied by Affirmer to the Work. Should any part of the License for any
94+
reason be judged legally invalid or ineffective under applicable law, such
95+
partial invalidity or ineffectiveness shall not invalidate the remainder
96+
of the License, and in such case Affirmer hereby affirms that he or she
97+
will not (i) exercise any of his or her remaining Copyright and Related
98+
Rights in the Work or (ii) assert any associated claims and causes of
99+
action with respect to the Work, in either case contrary to Affirmer's
100+
express Statement of Purpose.
101+
102+
4. Limitations and Disclaimers.
103+
104+
a. No trademark or patent rights held by Affirmer are waived, abandoned,
105+
surrendered, licensed or otherwise affected by this document.
106+
b. Affirmer offers the Work as-is and makes no representations or
107+
warranties of any kind concerning the Work, express, implied,
108+
statutory or otherwise, including without limitation warranties of
109+
title, merchantability, fitness for a particular purpose, non
110+
infringement, or the absence of latent or other defects, accuracy, or
111+
the present or absence of errors, whether or not discoverable, all to
112+
the greatest extent permissible under applicable law.
113+
c. Affirmer disclaims responsibility for clearing rights of other persons
114+
that may apply to the Work or any use thereof, including without
115+
limitation any person's Copyright and Related Rights in the Work.
116+
Further, Affirmer disclaims responsibility for obtaining any necessary
117+
consents, permissions or other rights required for any use of the
118+
Work.
119+
d. Affirmer understands and acknowledges that Creative Commons is not a
120+
party to this document and has no duty or obligation with respect to
121+
this CC0 or use of the Work.

‎aabb.h

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
//==================================================================================================
2+
// Written in 2016 by Peter Shirley <[email protected]>
3+
//
4+
// To the extent possible under law, the author(s) have dedicated all copyright and related and
5+
// neighboring rights to this software to the public domain worldwide. This software is distributed
6+
// without any warranty.
7+
//
8+
// You should have received a copy (see file COPYING.md) of the CC0 Public Domain Dedication along
9+
// with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
10+
//==================================================================================================
11+
112
#ifndef AABBH
213
#define AABBH
314
#include "ray.h"
@@ -9,16 +20,16 @@ inline float ffmax(float a, float b) { return a > b ? a : b; }
920
class aabb {
1021
public:
1122
aabb() {}
12-
aabb(const vec3& a, const vec3& b) { _min = a; _max = b;}
23+
aabb(const vec3& a, const vec3& b) { _min = a; _max = b;}
1324

1425
vec3 min() const {return _min; }
1526
vec3 max() const {return _max; }
1627

1728
bool hit(const ray& r, float tmin, float tmax) const {
1829
for (int a = 0; a < 3; a++) {
19-
float t0 = ffmin((_min[a] - r.origin()[a]) / r.direction()[a],
30+
float t0 = ffmin((_min[a] - r.origin()[a]) / r.direction()[a],
2031
(_max[a] - r.origin()[a]) / r.direction()[a]);
21-
float t1 = ffmax((_min[a] - r.origin()[a]) / r.direction()[a],
32+
float t1 = ffmax((_min[a] - r.origin()[a]) / r.direction()[a],
2233
(_max[a] - r.origin()[a]) / r.direction()[a]);
2334
tmin = ffmax(t0, tmin);
2435
tmax = ffmin(t1, tmax);
@@ -43,7 +54,7 @@ class aabb {
4354
return 0;
4455
else if (b > c)
4556
return 1;
46-
else
57+
else
4758
return 2;
4859
}
4960

@@ -64,7 +75,3 @@ aabb surrounding_box(aabb box0, aabb box1) {
6475

6576
#endif
6677

67-
68-
69-
70-

‎aarect.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
//==================================================================================================
2+
// Written in 2016 by Peter Shirley <[email protected]>
3+
//
4+
// To the extent possible under law, the author(s) have dedicated all copyright and related and
5+
// neighboring rights to this software to the public domain worldwide. This software is distributed
6+
// without any warranty.
7+
//
8+
// You should have received a copy (see file COPYING.md) of the CC0 Public Domain Dedication along
9+
// with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
10+
//==================================================================================================
11+
112
#ifndef AARECTH
213
#define AARECTH
314

‎box.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
//==================================================================================================
2+
// Written in 2016 by Peter Shirley <[email protected]>
3+
//
4+
// To the extent possible under law, the author(s) have dedicated all copyright and related and
5+
// neighboring rights to this software to the public domain worldwide. This software is distributed
6+
// without any warranty.
7+
//
8+
// You should have received a copy (see file COPYING.md) of the CC0 Public Domain Dedication along
9+
// with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
10+
//==================================================================================================
11+
112
#ifndef BOXH
213
#define BOXH
314

‎bucamera.h

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
//==================================================================================================
2+
// Written in 2016 by Peter Shirley <[email protected]>
3+
//
4+
// To the extent possible under law, the author(s) have dedicated all copyright and related and
5+
// neighboring rights to this software to the public domain worldwide. This software is distributed
6+
// without any warranty.
7+
//
8+
// You should have received a copy (see file COPYING.md) of the CC0 Public Domain Dedication along
9+
// with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
10+
//==================================================================================================
11+
112
#ifndef CAMERAH
213
#define CAMERAH
314

@@ -7,12 +18,12 @@ class camera {
718
public:
819
camera() {
920
lower_left_corner = vec3(-2.0, -1.0, -1.0);
10-
horizontal = vec3(4.0, 0.0, 0.0);
11-
vertical = vec3(0.0, 2.0, 0.0);
21+
horizontal = vec3(4.0, 0.0, 0.0);
22+
vertical = vec3(0.0, 2.0, 0.0);
1223
/*
1324
lower_left_corner = vec3(-.1, -0.05, -1.0);
14-
horizontal = vec3(0.2, 0.0, 0.0);
15-
vertical = vec3(0.0, 0.1, 0.0);
25+
horizontal = vec3(0.2, 0.0, 0.0);
26+
vertical = vec3(0.0, 0.1, 0.0);
1627
*/
1728
origin = vec3(0.0, 0.0, 0.0);
1829
}
@@ -36,6 +47,3 @@ class camera {
3647

3748
#endif
3849

39-
40-
41-

‎bvh.h

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
//==================================================================================================
2+
// Written in 2016 by Peter Shirley <[email protected]>
3+
//
4+
// To the extent possible under law, the author(s) have dedicated all copyright and related and
5+
// neighboring rights to this software to the public domain worldwide. This software is distributed
6+
// without any warranty.
7+
//
8+
// You should have received a copy (see file COPYING.md) of the CC0 Public Domain Dedication along
9+
// with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
10+
//==================================================================================================
11+
112
#ifndef BVHH
213
#define BVHH
314

@@ -26,9 +37,9 @@ bool bvh_node::hit(const ray& r, float t_min, float t_max, hit_record& rec) cons
2637
bool hit_left = left->hit(r, t_min, t_max, left_rec);
2738
bool hit_right = right->hit(r, t_min, t_max, right_rec);
2839
if (hit_left && hit_right) {
29-
if (left_rec.t < right_rec.t)
40+
if (left_rec.t < right_rec.t)
3041
rec = left_rec;
31-
else
42+
else
3243
rec = right_rec;
3344
return true;
3445
}
@@ -40,7 +51,7 @@ bool bvh_node::hit(const ray& r, float t_min, float t_max, hit_record& rec) cons
4051
rec = right_rec;
4152
return true;
4253
}
43-
else
54+
else
4455
return false;
4556
}
4657
else return false;
@@ -109,13 +120,13 @@ bvh_node::bvh_node(hitable **l, int n, float time0, float time1) {
109120
aabb left_box = boxes[0];
110121
for (int i = 1; i < n-1; i++) {
111122
left_box = surrounding_box(left_box, boxes[i]);
112-
left_area[i] = left_box.area();
123+
left_area[i] = left_box.area();
113124
}
114125
right_area[n-1] = boxes[n-1].area();
115126
aabb right_box = boxes[n-1];
116127
for (int i = n-2; i > 0; i--) {
117128
right_box = surrounding_box(right_box, boxes[i]);
118-
right_area[i] = right_box.area();
129+
right_area[i] = right_box.area();
119130
}
120131
float min_SAH = FLT_MAX;
121132
int min_SAH_idx;
@@ -127,27 +138,28 @@ bvh_node::bvh_node(hitable **l, int n, float time0, float time1) {
127138
}
128139
}
129140

130-
/*
131-
if (min_SAH_idx == 0)
141+
/*
142+
if (min_SAH_idx == 0)
132143
left = l[0];
133144
else
134145
left = new bvh_node(l, min_SAH_idx+1, time0, time1);
135-
if (min_SAH_idx == n-2)
146+
if (min_SAH_idx == n-2)
136147
right = l[min_SAH_idx+1];
137148
else
138149
right = new bvh_node(l + min_SAH_idx+1, n - min_SAH_idx -1, time0, time1);
139-
*/
140-
if (n == 1) {
141-
left = right = l[0];
142-
}
143-
else if (n == 2) {
144-
left = l[0];
145-
right = l[1];
146-
}
147-
else {
148-
left = new bvh_node(l, n/2, time0, time1);
149-
right = new bvh_node(l + n/2, n - n/2, time0, time1);
150-
}
150+
*/
151+
152+
if (n == 1) {
153+
left = right = l[0];
154+
}
155+
else if (n == 2) {
156+
left = l[0];
157+
right = l[1];
158+
}
159+
else {
160+
left = new bvh_node(l, n/2, time0, time1);
161+
right = new bvh_node(l + n/2, n - n/2, time0, time1);
162+
}
151163

152164
box = main_box;
153165
}

‎camera.h

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
//==================================================================================================
2+
// Written in 2016 by Peter Shirley <[email protected]>
3+
//
4+
// To the extent possible under law, the author(s) have dedicated all copyright and related and
5+
// neighboring rights to this software to the public domain worldwide. This software is distributed
6+
// without any warranty.
7+
//
8+
// You should have received a copy (see file COPYING.md) of the CC0 Public Domain Dedication along
9+
// with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
10+
//==================================================================================================
11+
112
#ifndef CAMERAH
213
#define CAMERAH
314
#include "ray.h"
@@ -34,7 +45,7 @@ class camera {
3445
vec3 rd = lens_radius*random_in_unit_disk();
3546
vec3 offset = u * rd.x() + v * rd.y();
3647
float time = time0 + drand48()*(time1-time0);
37-
return ray(origin + offset, lower_left_corner + s*horizontal + t*vertical - origin - offset, time);
48+
return ray(origin + offset, lower_left_corner + s*horizontal + t*vertical - origin - offset, time);
3849
}
3950

4051
vec3 origin;
@@ -47,6 +58,3 @@ class camera {
4758
};
4859
#endif
4960

50-
51-
52-

‎constant_medium.h

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1+
//==================================================================================================
2+
// Written in 2016 by Peter Shirley <[email protected]>
3+
//
4+
// To the extent possible under law, the author(s) have dedicated all copyright and related and
5+
// neighboring rights to this software to the public domain worldwide. This software is distributed
6+
// without any warranty.
7+
//
8+
// You should have received a copy (see file COPYING.md) of the CC0 Public Domain Dedication along
9+
// with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
10+
//==================================================================================================
11+
112
#ifndef CMEDH
2-
#define CMEDH
13+
#define CMEDH
314

415
#include "hitable.h"
516
#include <float.h>

0 commit comments

Comments
 (0)