godzil/dorayme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renaming Object to Shape (part 2)

Browse Source
This commit is contained in:
Godzil
2020-02-18 11:43:05 +00:00
parent 5a4f9f4dc4
commit af96d52c5a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/include/object.h → source/include/shape.h
View File

@@ -6,8 +6,8 @@
* Copyright (c) 2020 986-Studio. * Copyright (c) 2020 986-Studio.
* *
*/ */
#ifndef DORAYME_OBJECT_H #ifndef DORAYME_SHAPE_H
#define DORAYME_OBJECT_H #define DORAYME_SHAPE_H
class Shape; class Shape;
@@ -37,4 +37,4 @@ public:
Ray invTransform(Ray r) { return Ray(this->inverseTransform * r.origin, this->inverseTransform * r.direction); }; Ray invTransform(Ray r) { return Ray(this->inverseTransform * r.origin, this->inverseTransform * r.direction); };
}; };
#endif //DORAYME_OBJECT_H #endif //DORAYME_SHAPE_H

2
source/include/sphere.h
View File

@@ -9,7 +9,7 @@
#ifndef DORAYME_SPHERE_H #ifndef DORAYME_SPHERE_H
#define DORAYME_SPHERE_H #define DORAYME_SPHERE_H
#include <object.h> #include <shape.h>
#include <ray.h> #include <ray.h>
#include <intersect.h> #include <intersect.h>

2
source/shapes/object.cpp → source/shapes/shape.cpp
View File

@@ -8,7 +8,7 @@
*/ */
#include <ray.h> #include <ray.h>
#include <object.h> #include <shape.h>
#include <matrix.h> #include <matrix.h>
#include <tuple.h> #include <tuple.h>
#include <intersect.h> #include <intersect.h>

2
tests/ray_test.cpp
View File

@@ -8,7 +8,7 @@
*/ */
#include <ray.h> #include <ray.h>
#include <transformation.h> #include <transformation.h>
#include <object.h> #include <shape.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>