Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
CppRaytracer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yoel
CppRaytracer
Commits
97cd5a63
Commit
97cd5a63
authored
4 years ago
by
Yoel
Browse files
Options
Downloads
Patches
Plain Diff
Material is now purely an interface
parent
5e373e8e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
RayTracer/material/Material.cpp
+0
-20
0 additions, 20 deletions
RayTracer/material/Material.cpp
RayTracer/material/Material.h
+1
-7
1 addition, 7 deletions
RayTracer/material/Material.h
with
1 addition
and
27 deletions
RayTracer/material/Material.cpp
deleted
100644 → 0
+
0
−
20
View file @
5e373e8e
#include
"Material.h"
namespace
material
{
util
::
Vec3
rand_vec3
()
{
return
util
::
Vec3
(
dis
(
gen
),
dis
(
gen
),
dis
(
gen
));
}
bool
in_circle
(
const
util
::
Vec3
&
v
)
{
return
v
.
length
()
<=
1
;
}
util
::
Vec3
rand_vec3_in_circle
(
float
r
)
{
util
::
Vec3
result
;
do
{
result
=
rand_vec3
();
}
while
(
!
in_circle
(
result
));
return
result
*
r
;
}
}
// namespace material
\ No newline at end of file
This diff is collapsed.
Click to expand it.
RayTracer/material/Material.h
+
1
−
7
View file @
97cd5a63
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
#include
<random>
#include
<random>
#include
"../sampling/Sampler.h"
#include
"../sampling/Sampler.h"
#include
"../tools/Vec3.h"
namespace
material
{
namespace
material
{
...
@@ -14,11 +15,4 @@ class Material {
...
@@ -14,11 +15,4 @@ class Material {
const
util
::
Vec3
&
n
)
const
=
0
;
const
util
::
Vec3
&
n
)
const
=
0
;
virtual
bool
scatter
()
const
=
0
;
virtual
bool
scatter
()
const
=
0
;
};
};
static
std
::
random_device
rd
;
static
std
::
mt19937
gen
(
rd
());
static
std
::
uniform_real_distribution
<>
dis
(
-
1.0
,
1.0
);
util
::
Vec3
rand_vec3
();
bool
in_circle
(
const
util
::
Vec3
&
v
);
util
::
Vec3
rand_vec3_in_circle
(
float
r
);
}
// namespace material
}
// namespace material
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment