Josh Holtrop
|
8a112009a6
|
converted shapes and lights collection in Scene to be refptrs instead of real pointers
git-svn-id: svn://anubis/fart/trunk@102 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-11 17:23:01 +00:00 |
|
Josh Holtrop
|
7f9b8b913a
|
added Shape::~Shape() to work around compiler warnings
git-svn-id: svn://anubis/fart/trunk@101 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-11 17:11:30 +00:00 |
|
Josh Holtrop
|
ee64558db6
|
made parser/parser.yy:parse() a method of class Scene so no global g_scene is needed
git-svn-id: svn://anubis/fart/trunk@100 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-11 17:08:38 +00:00 |
|
Josh Holtrop
|
8b9b6332cc
|
changed getPtr() to isNull() in util/refptr, filled in parser logic a lot more
git-svn-id: svn://anubis/fart/trunk@99 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-11 04:27:44 +00:00 |
|
Josh Holtrop
|
236cbc7db0
|
added getPtr() to util/refptr
git-svn-id: svn://anubis/fart/trunk@98 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-10 01:21:54 +00:00 |
|
Josh Holtrop
|
2f16235ed2
|
updating parser logic
git-svn-id: svn://anubis/fart/trunk@97 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-10 01:20:05 +00:00 |
|
Josh Holtrop
|
0fc1e468fe
|
removed test directory, converted Shape's material handle to a refptr<Material> instead of a Material *, made refptr<T>::operator*() and operator->() const members
git-svn-id: svn://anubis/fart/trunk@96 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-10 01:09:07 +00:00 |
|
Josh Holtrop
|
2e82f9e2ea
|
adding required arguments to shape constructors in scene description language
git-svn-id: svn://anubis/fart/trunk@95 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-10 00:52:38 +00:00 |
|
Josh Holtrop
|
0181e82653
|
added dereference and indirection operators to util/refptr, converted parser to use refptr<Node> as YYSTYPE
git-svn-id: svn://anubis/fart/trunk@94 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-10 00:37:49 +00:00 |
|
Josh Holtrop
|
c6e1a2c7e4
|
added refptr<T>::operator=(const T * ptr) method, including refptr in parser
git-svn-id: svn://anubis/fart/trunk@93 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-10 00:18:07 +00:00 |
|
Josh Holtrop
|
e2424337d6
|
moved all refptr functions into util/refptr.h since they are templated, deleted util/refptr.cc, updated test/tests.cc to test refptr functionality
git-svn-id: svn://anubis/fart/trunk@92 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-10 00:10:04 +00:00 |
|
Josh Holtrop
|
498d35274d
|
fixed up util/refptr
git-svn-id: svn://anubis/fart/trunk@91 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-09 23:51:00 +00:00 |
|
Josh Holtrop
|
d34242252a
|
added util/refptr module
git-svn-id: svn://anubis/fart/trunk@90 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-09 23:31:15 +00:00 |
|
Josh Holtrop
|
fc8a46853b
|
added some setters to Scene, including some modules in parser, ready to do something with the parse results
git-svn-id: svn://anubis/fart/trunk@89 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-09 02:55:02 +00:00 |
|
Josh Holtrop
|
70eeff90fb
|
added class node to parser to store parsed node types (YYSTYPE is now Node)
git-svn-id: svn://anubis/fart/trunk@88 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-09 00:24:19 +00:00 |
|
Josh Holtrop
|
3da5e6d569
|
added scenes and scenes/infinity.fart
git-svn-id: svn://anubis/fart/trunk@87 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-09 00:08:36 +00:00 |
|
Josh Holtrop
|
c3e31eab4a
|
added boolean shapes to parser
git-svn-id: svn://anubis/fart/trunk@86 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-08 23:57:57 +00:00 |
|
Josh Holtrop
|
f5dc4c7f93
|
updated parser rules a bit
git-svn-id: svn://anubis/fart/trunk@85 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-08 23:24:11 +00:00 |
|
Josh Holtrop
|
ba7190d7d8
|
working on parser
git-svn-id: svn://anubis/fart/trunk@84 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-08 19:42:55 +00:00 |
|
Josh Holtrop
|
80004438be
|
added parser/preparser.cc
git-svn-id: svn://anubis/fart/trunk@83 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-05 03:13:28 +00:00 |
|
Josh Holtrop
|
afd0df3ce4
|
added LESS and GREATER to parser tokens
git-svn-id: svn://anubis/fart/trunk@82 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-04 20:41:47 +00:00 |
|
Josh Holtrop
|
e758f53a3e
|
added svn:ignore to parser directory for flex and bison produced files
git-svn-id: svn://anubis/fart/trunk@81 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-04 18:51:18 +00:00 |
|
Josh Holtrop
|
dab2381fba
|
parser modules now compiling and linking with main build process
git-svn-id: svn://anubis/fart/trunk@80 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-04 18:50:15 +00:00 |
|
Josh Holtrop
|
1fe251f27d
|
added -lfl to LDFLAGS in main Makefile, added parser/parser.{lex,yy} and parser/Makefile (for real this time)
git-svn-id: svn://anubis/fart/trunk@79 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-04 18:45:55 +00:00 |
|
Josh Holtrop
|
31a7f0fedf
|
updated subdir Makefiles, added parser directory and parser/Makefile
git-svn-id: svn://anubis/fart/trunk@78 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-04 18:35:32 +00:00 |
|
Josh Holtrop
|
d421a652e4
|
fixed compile warning in util/Color for return value of operator+= and -=
git-svn-id: svn://anubis/fart/trunk@77 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-02-02 15:29:01 +00:00 |
|
Josh Holtrop
|
78fd509d0f
|
back up to default ambient of (0.1, 0.1, 0.1), Phong shading working
git-svn-id: svn://anubis/fart/trunk@76 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-31 22:42:14 +00:00 |
|
Josh Holtrop
|
c4509d0594
|
added an ambient color component to Material, changed Lighting to use it
git-svn-id: svn://anubis/fart/trunk@75 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-31 22:34:36 +00:00 |
|
Josh Holtrop
|
7181a894a4
|
capping colors in main/Lighting; colors are maxing out too easily, might need a better reduction method
git-svn-id: svn://anubis/fart/trunk@74 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-31 18:29:28 +00:00 |
|
Josh Holtrop
|
6fbdf46122
|
fixed bug in util/Vector::reflect(), Phong shading getting much closer
git-svn-id: svn://anubis/fart/trunk@73 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-31 00:17:09 +00:00 |
|
Josh Holtrop
|
41b4354d52
|
trying to get Phong shading model working, having very large color values come back though
git-svn-id: svn://anubis/fart/trunk@72 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-30 20:53:13 +00:00 |
|
Josh Holtrop
|
8677680577
|
added main/Lighting module, added operator-() to util/Vector, added m_shininess to main/Light
git-svn-id: svn://anubis/fart/trunk@71 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-30 20:28:05 +00:00 |
|
Josh Holtrop
|
434064c03c
|
updated main/Material setters & getters for diffuse & specular colors
git-svn-id: svn://anubis/fart/trunk@70 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-30 04:31:18 +00:00 |
|
Josh Holtrop
|
18c0c8d45f
|
added diffuse and specular colors to Material, switched all "private:" to "protected:"
git-svn-id: svn://anubis/fart/trunk@69 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-30 02:26:46 +00:00 |
|
Josh Holtrop
|
04b8ea5f9e
|
added main/Material module
git-svn-id: svn://anubis/fart/trunk@68 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-30 02:20:29 +00:00 |
|
Josh Holtrop
|
f087488b39
|
using Color instead of Vector where appropriate, updated main/Light to use diffuse and specular lights
git-svn-id: svn://anubis/fart/trunk@67 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-30 01:25:57 +00:00 |
|
Josh Holtrop
|
08a0047ba8
|
added proj() and reflect() to util/Vector, changed util/Transform to use Vector::proj() in lookAt()
git-svn-id: svn://anubis/fart/trunk@66 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-30 00:18:20 +00:00 |
|
Josh Holtrop
|
c5ac957dff
|
updated BMP.cc to avoid compiler warnings
git-svn-id: svn://anubis/fart/trunk@65 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-29 23:16:51 +00:00 |
|
Josh Holtrop
|
47dd5a31fe
|
fixed strange compile warning in fart.cc by making constructor arguments to Scene::Scene() consts
git-svn-id: svn://anubis/fart/trunk@64 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-29 14:49:41 +00:00 |
|
Josh Holtrop
|
866f22a637
|
added operator*(Vector,double) and operator/(Vector,double) to util/Vector; added lookAt() to util/Transform (needs testing)
git-svn-id: svn://anubis/fart/trunk@63 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-28 23:47:46 +00:00 |
|
Josh Holtrop
|
9041ec6a1c
|
shapes/Shape.h now including specific shape headers (after base class definition), test/tests.cc fixed compiler warning, main/Scene drawing demo Plane, util/Transform not needlessly re-initializing m_matrix
git-svn-id: svn://anubis/fart/trunk@62 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-28 21:41:19 +00:00 |
|
Josh Holtrop
|
a52b456bfa
|
updated Makefile to use -O1 in CXXFLAGS instead of -O3; -O2 and above currently break the app
git-svn-id: svn://anubis/fart/trunk@61 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-28 18:51:14 +00:00 |
|
Josh Holtrop
|
ca3087eac5
|
shapes returning transformed normals
git-svn-id: svn://anubis/fart/trunk@60 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-28 15:06:48 +00:00 |
|
Josh Holtrop
|
7a4bb7dbc2
|
added LinearSolver to util/Solver module; added shapes/Plane module
git-svn-id: svn://anubis/fart/trunk@59 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-28 15:02:05 +00:00 |
|
Josh Holtrop
|
e34bdf0d71
|
fixed test/tests.cc
git-svn-id: svn://anubis/fart/trunk@58 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-28 01:15:20 +00:00 |
|
Josh Holtrop
|
fa353392c6
|
updating main/Scene to accept points back instead of distances from intersect()
git-svn-id: svn://anubis/fart/trunk@57 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-27 23:03:24 +00:00 |
|
Josh Holtrop
|
83bb409ef9
|
added Shape::IntersectList for returning a list of intersection points instead of intersections distances; build currently broken; need to update Scene to take into effect this change
git-svn-id: svn://anubis/fart/trunk@56 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-27 18:48:04 +00:00 |
|
Josh Holtrop
|
47cf177a15
|
removed svn:executable for some files
git-svn-id: svn://anubis/fart/trunk@55 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-27 18:28:38 +00:00 |
|
Josh Holtrop
|
5213df1af3
|
added shapes/Shape.cc
git-svn-id: svn://anubis/fart/trunk@54 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-27 18:15:06 +00:00 |
|
Josh Holtrop
|
f4781e2889
|
updated getRayHits(), fixed bug in Scene::ShapeDistance(Shape *, double)
git-svn-id: svn://anubis/fart/trunk@53 7f9b0f55-74a9-4bce-be96-3c2cd072584d
|
2009-01-27 01:34:00 +00:00 |
|