eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
charles/src/object.cc

154 lines
2 KiB
C++
Raw Normal View History

Add object module
2013-09-07 16:09:19 -07:00
/* object.c
*
Define constructors for Object and Shape; move a bunch of Sphere code to object_sphere
2013-09-10 15:45:13 -07:00
* Definition of generic scene objects.
Add object module
2013-09-07 16:09:19 -07:00
*
* Eryn Wells <eryn@erynwells.me>
*/
Move Sphere::does_intersect to object_sphere; fill out object_sphere in C++
2013-09-10 09:33:59 -07:00
#include <cassert>
#include <cmath>
#include <cstdlib>
Add texture to objects
2013-09-07 22:22:27 -07:00
Do all the clean up needed for Object
2014-08-09 10:42:49 -07:00
#include "object.hh"
More compiler fixups
2014-08-09 21:23:11 -07:00
#include "material.hh"
Clean up constructors for Object and Sphere Use default arguments instead of multiple constructors. I forgot about those! Use Vector4s all around.
2014-08-09 08:57:41 -07:00
#include "basics/basics.hh"
Do all the clean up needed for Object
2014-08-09 10:42:49 -07:00
using charles::basics::Ray;
Fix up Object object space conversions - Ray directions shouldn't be translated - Implement vector translation to global space
2014-08-15 22:33:22 -07:00
using charles::basics::Matrix4;
Clean up constructors for Object and Sphere Use default arguments instead of multiple constructors. I forgot about those! Use Vector4s all around.
2014-08-09 08:57:41 -07:00
using charles::basics::Vector4;
Add object module
2013-09-07 16:09:19 -07:00
Update code style for Object - Remove Shape, because it seems to be mostly extra. All renderable objects now derive from Object, rather than Shape - Light (which inherited from Object before) now defines its own origin, but this is coming in a later commit... - Use charles namespace - Use a std::vector<double> instead of float** to pass back intersection points. This is kind of a biggie because it made the render process 50% slower :( I'll have to work out why and maybe fix it...
2014-07-20 16:46:49 -07:00
namespace charles {
Add Write methods to scene objects Write methods are polymorphic, overridden by subclasses. There is a single operator<< for Objects that calls the right Write() method for the object. Neat.
2014-08-03 17:25:00 -07:00
Object::Intersect A new intersect method that converts to object space before doing the intersection. Now all objects are at their own origin!
2014-08-09 09:59:00 -07:00
/*
* charles::Object::Object --
*/
Clean up constructors for Object and Sphere Use default arguments instead of multiple constructors. I forgot about those! Use Vector4s all around.
2014-08-09 08:57:41 -07:00
Object::Object(const Vector4& origin)
Use the Vector4 version of Matrix4::Translation for object origins
2014-08-16 20:35:49 -07:00
: mTranslation(Matrix4::Translation(origin)),
Clean up constructors for Object and Sphere Use default arguments instead of multiple constructors. I forgot about those! Use Vector4s all around.
2014-08-09 08:57:41 -07:00
mMaterial()
Define constructors for Object and Shape; move a bunch of Sphere code to object_sphere
2013-09-10 15:45:13 -07:00
{ }
/*
Get rid of object's origin
2014-08-09 08:59:11 -07:00
* charles::Object::~Object --
Define constructors for Object and Shape; move a bunch of Sphere code to object_sphere
2013-09-10 15:45:13 -07:00
*/
Update code style for Object - Remove Shape, because it seems to be mostly extra. All renderable objects now derive from Object, rather than Shape - Light (which inherited from Object before) now defines its own origin, but this is coming in a later commit... - Use charles namespace - Use a std::vector<double> instead of float** to pass back intersection points. This is kind of a biggie because it made the render process 50% slower :( I'll have to work out why and maybe fix it...
2014-07-20 16:46:49 -07:00
Object::~Object()
Define constructors for Object and Shape; move a bunch of Sphere code to object_sphere
2013-09-10 15:45:13 -07:00
{ }
Add sphere intersection function
2013-09-07 18:26:32 -07:00
Add sphere_point_lies_on_surface and sphere_compute_normal
2013-09-09 08:52:14 -07:00
Do all the clean up needed for Object
2014-08-09 10:42:49 -07:00
/*
* charles::Object::GetMaterial --
*/
Update code style for Object - Remove Shape, because it seems to be mostly extra. All renderable objects now derive from Object, rather than Shape - Light (which inherited from Object before) now defines its own origin, but this is coming in a later commit... - Use charles namespace - Use a std::vector<double> instead of float** to pass back intersection points. This is kind of a biggie because it made the render process 50% slower :( I'll have to work out why and maybe fix it...
2014-07-20 16:46:49 -07:00
Material&
Object::GetMaterial()
Add sphere_point_lies_on_surface and sphere_compute_normal
2013-09-09 08:52:14 -07:00
{
Update code style for Object - Remove Shape, because it seems to be mostly extra. All renderable objects now derive from Object, rather than Shape - Light (which inherited from Object before) now defines its own origin, but this is coming in a later commit... - Use charles namespace - Use a std::vector<double> instead of float** to pass back intersection points. This is kind of a biggie because it made the render process 50% slower :( I'll have to work out why and maybe fix it...
2014-07-20 16:46:49 -07:00
return mMaterial;
Add sphere_point_lies_on_surface and sphere_compute_normal
2013-09-09 08:52:14 -07:00
}
Update code style for Object - Remove Shape, because it seems to be mostly extra. All renderable objects now derive from Object, rather than Shape - Light (which inherited from Object before) now defines its own origin, but this is coming in a later commit... - Use charles namespace - Use a std::vector<double> instead of float** to pass back intersection points. This is kind of a biggie because it made the render process 50% slower :( I'll have to work out why and maybe fix it...
2014-07-20 16:46:49 -07:00
Implement Object::Place Places the object by manipulating its translation matrix.
2014-08-15 22:32:44 -07:00
/*
* charles::Object::Place --
*/
void
Object::Place(const Vector4 &p)
{
mTranslation = Matrix4::Translation(p);
}
Do all the clean up needed for Object
2014-08-09 10:42:49 -07:00
/*
* charles::Object::SetMaterial --
*/
Add Materials to the shapes in the scene
2013-09-11 09:05:27 -07:00
void
Update code style for Object - Remove Shape, because it seems to be mostly extra. All renderable objects now derive from Object, rather than Shape - Light (which inherited from Object before) now defines its own origin, but this is coming in a later commit... - Use charles namespace - Use a std::vector<double> instead of float** to pass back intersection points. This is kind of a biggie because it made the render process 50% slower :( I'll have to work out why and maybe fix it...
2014-07-20 16:46:49 -07:00
Object::SetMaterial(const Material& material)
Add sphere_point_lies_on_surface and sphere_compute_normal
2013-09-09 08:52:14 -07:00
{
Update code style for Object - Remove Shape, because it seems to be mostly extra. All renderable objects now derive from Object, rather than Shape - Light (which inherited from Object before) now defines its own origin, but this is coming in a later commit... - Use charles namespace - Use a std::vector<double> instead of float** to pass back intersection points. This is kind of a biggie because it made the render process 50% slower :( I'll have to work out why and maybe fix it...
2014-07-20 16:46:49 -07:00
mMaterial = material;
Add sphere_point_lies_on_surface and sphere_compute_normal
2013-09-09 08:52:14 -07:00
}
Update code style for Object - Remove Shape, because it seems to be mostly extra. All renderable objects now derive from Object, rather than Shape - Light (which inherited from Object before) now defines its own origin, but this is coming in a later commit... - Use charles namespace - Use a std::vector<double> instead of float** to pass back intersection points. This is kind of a biggie because it made the render process 50% slower :( I'll have to work out why and maybe fix it...
2014-07-20 16:46:49 -07:00
Add Write methods to scene objects Write methods are polymorphic, overridden by subclasses. There is a single operator<< for Objects that calls the right Write() method for the object. Neat.
2014-08-03 17:25:00 -07:00
Object::Intersect A new intersect method that converts to object space before doing the intersection. Now all objects are at their own origin!
2014-08-09 09:59:00 -07:00
/*
* charles::Object::Intersect --
*/
bool
Object::Intersect(const basics::Ray& ray,
TVector& t,
Stats& stats)
const
{
Do all the clean up needed for Object
2014-08-09 10:42:49 -07:00
return DoIntersect(ToObjectSpace(ray), t, stats);
}
/*
* charles::Object::Normal --
*/
Vector4
Object::Normal(const Vector4& p)
const
{
return FromObjectSpace(DoNormal(ToObjectSpace(p)));
Object::Intersect A new intersect method that converts to object space before doing the intersection. Now all objects are at their own origin!
2014-08-09 09:59:00 -07:00
}
/*
* charles::Object::ToObjectSpace --
*/
Do all the clean up needed for Object
2014-08-09 10:42:49 -07:00
Ray
ToObjectSpace copies the Ray anyway, so pass by value
2014-08-10 16:58:05 -07:00
Object::ToObjectSpace(Ray ray)
Object::Intersect A new intersect method that converts to object space before doing the intersection. Now all objects are at their own origin!
2014-08-09 09:59:00 -07:00
const
{
ToObjectSpace copies the Ray anyway, so pass by value
2014-08-10 16:58:05 -07:00
ray.origin = mTranslation * ray.origin;
return ray;
Object::Intersect A new intersect method that converts to object space before doing the intersection. Now all objects are at their own origin!
2014-08-09 09:59:00 -07:00
}
Do all the clean up needed for Object
2014-08-09 10:42:49 -07:00
/*
* charles::Object::ToObjectSpace --
*/
Vector4
Object::ToObjectSpace(const Vector4& v)
const
{
return mTranslation * v;
}
/*
* charles::Object::FromObjectSpace --
*/
Vector4
Object::FromObjectSpace(const Vector4& v)
const
{
Fix up Object object space conversions - Ray directions shouldn't be translated - Implement vector translation to global space
2014-08-15 22:33:22 -07:00
return Inverse(mTranslation) * v;
Do all the clean up needed for Object
2014-08-09 10:42:49 -07:00
}
/*
* charles::Object::Write --
*/
Add Write methods to scene objects Write methods are polymorphic, overridden by subclasses. There is a single operator<< for Objects that calls the right Write() method for the object. Neat.
2014-08-03 17:25:00 -07:00
void
Object::Write(std::ostream& ost)
const
{
ost << "[Object]";
}
Do all the clean up needed for Object
2014-08-09 10:42:49 -07:00
/*
* charles::operator<< --
*/
Add Write methods to scene objects Write methods are polymorphic, overridden by subclasses. There is a single operator<< for Objects that calls the right Write() method for the object. Neat.
2014-08-03 17:25:00 -07:00
std::ostream&
operator<<(std::ostream& ost,
const Object& object)
{
Get a column vector of a matrix
2014-08-16 00:43:43 -07:00
ost << "[";
Add Write methods to scene objects Write methods are polymorphic, overridden by subclasses. There is a single operator<< for Objects that calls the right Write() method for the object. Neat.
2014-08-03 17:25:00 -07:00
object.Write(ost);
Get a column vector of a matrix
2014-08-16 00:43:43 -07:00
ost << " translate=" << object.mTranslation.Column(3) << "]";
Add Write methods to scene objects Write methods are polymorphic, overridden by subclasses. There is a single operator<< for Objects that calls the right Write() method for the object. Neat.
2014-08-03 17:25:00 -07:00
return ost;
}
Update code style for Object - Remove Shape, because it seems to be mostly extra. All renderable objects now derive from Object, rather than Shape - Light (which inherited from Object before) now defines its own origin, but this is coming in a later commit... - Use charles namespace - Use a std::vector<double> instead of float** to pass back intersection points. This is kind of a biggie because it made the render process 50% slower :( I'll have to work out why and maybe fix it...
2014-07-20 16:46:49 -07:00
} /* namespace charles */
Reference in a new issue Copy permalink