josh/fart
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 5af3f0deca i think i have union working, need to test after transparency is working Josh Holtrop 2009-02-27 22:29:27 +00:00
  • 27cea5e702 added Union shape based on Intersect Josh Holtrop 2009-02-27 18:34:08 +00:00
  • 16f38f1f27 added sample Intersect object to sample scene, added Color::magenta constant Josh Holtrop 2009-02-24 03:35:20 +00:00
  • f7eb4cd4b9 finished implementing shapes/Intersect::intersect() Josh Holtrop 2009-02-24 03:22:15 +00:00
  • 527dc6f1dc added virtual ~Solver() in util/Solver to avoid compiler warnings Josh Holtrop 2009-02-24 03:05:43 +00:00
  • bcbec65a8f converted shapes/Intersect::intersect() to using BoolIntersectionList Josh Holtrop 2009-02-24 03:04:26 +00:00
  • 2e6c62a032 working on Intersect::intersect() Josh Holtrop 2009-02-24 02:17:22 +00:00
  • 7d64dd745d got Shape::IntersectionList::merge() to sort the result with IntersectionComparator successfully Josh Holtrop 2009-02-24 00:38:09 +00:00
  • 25d6432dbd trying to get a custom comparator to sort my IntersectionList after a merge() Josh Holtrop 2009-02-23 22:26:46 +00:00
  • 56278a8337 changed IntersectionList into a class so i could add merge() Josh Holtrop 2009-02-23 21:39:56 +00:00
  • 5f18370846 merged /branches/2009-02-23_Shape_IntersectList_Update into trunk Josh Holtrop 2009-02-23 20:37:57 +00:00
  • ab2832a660 fixed compile issues with switch to new Shape::IntersectionList Josh Holtrop 2009-02-23 20:26:45 +00:00
  • 0c7f85db96 updating IntersectList to new Shape::IntersectionList format Josh Holtrop 2009-02-23 20:24:30 +00:00
  • 3b3a153559 created 2009-02-23_Shape_IntersectList_Update branch for changing Shape::IntersectList into a vector of Intersections, which contain both a pointer to the actual underlying Shape object and the vector for the intersection point. This will be necessary to support boolean objects. Josh Holtrop 2009-02-23 19:09:36 +00:00
  • e23d5cdca4 added shapes/Intersect, need to rework IntersectList Josh Holtrop 2009-02-23 05:51:51 +00:00
  • 29b60f346e added process*() functions in Scene-load.cc for various shape types Josh Holtrop 2009-02-21 14:36:18 +00:00
  • 864ef9b51b added skeleton process{Material,Light,Shape} functions to Scene-load.cc Josh Holtrop 2009-02-20 17:40:34 +00:00
  • 94548d4418 Light.h including concrete light type class definitions Josh Holtrop 2009-02-20 16:35:48 +00:00
  • 5949a813df moved processNode(), processChildren(), and load() into main/Scene-load.cc Josh Holtrop 2009-02-20 16:33:05 +00:00
  • 354edb9662 removed extraneous parse() function from Scene.cc Josh Holtrop 2009-02-19 22:00:51 +00:00
  • cda03ad45a moved main/Material to util/Material Josh Holtrop 2009-02-19 18:45:52 +00:00
  • 7f9547c010 fixed bug in shapes/Cyl intersection routine for top cap distance Josh Holtrop 2009-02-19 18:34:32 +00:00
  • 52103bf543 added static const cyan color, added cone to sample scene Josh Holtrop 2009-02-19 18:30:02 +00:00
  • 2b1603cf26 updated shapes/Cyl::getNormalAt(), added Cyl.h to shapes/Shape.h include list Josh Holtrop 2009-02-19 18:15:49 +00:00
  • 39e77678ee updated Cyl intersection routine Josh Holtrop 2009-02-19 18:03:23 +00:00
  • d8648b0770 working on shapes/Cyl Josh Holtrop 2009-02-19 04:35:51 +00:00
  • 561098001a added shapes/Cyl, needs finishing Josh Holtrop 2009-02-18 23:06:45 +00:00
  • 395161eb66 parser.lex keeping track of line number now Josh Holtrop 2009-02-18 02:10:27 +00:00
  • 76260a7696 bison yyerror() passing yylloc to errFunc() but line number is coming out as 1 Josh Holtrop 2009-02-18 01:57:50 +00:00
  • aaaac6d887 added location directives to flex and bison sources Josh Holtrop 2009-02-18 01:35:09 +00:00
  • b9cc1fe9f9 added Scene::processNode() and Scene::processChildren() Josh Holtrop 2009-02-18 01:10:57 +00:00
  • 30932d00e9 Scene::load() calling parse() now Josh Holtrop 2009-02-17 23:40:09 +00:00
  • b0014e34d1 made parsed_scene_node static to parser, parse() returns refptr<Node> now Josh Holtrop 2009-02-17 23:31:19 +00:00
  • f3e522262b removed knowledge of domain types from parser, removed process() from Node, added a global refptr<Node> object, took parse(fileName) out of Scene class Josh Holtrop 2009-02-17 22:59:53 +00:00
  • a8e898e445 changed DEC_NUMBER from generating a NumberNode to an IntegerNode in parser.lex Josh Holtrop 2009-02-17 14:15:34 +00:00
  • 4b0f506522 added Color::yellow, finished shapes/Box, added a couple boxes to sample scene Josh Holtrop 2009-02-17 05:36:48 +00:00
  • 13fedccf4c updated svn:ignore on parser directory for C++ version of flex output file Josh Holtrop 2009-02-17 05:21:06 +00:00
  • 22519b5a0c fixed bug in shapes/Plane, added shapes/Box Josh Holtrop 2009-02-17 05:20:38 +00:00
  • 0fea65d4ef added transform_block to parser, {Translate,Rotate,Scale}BlockNode nodes Josh Holtrop 2009-02-17 04:06:07 +00:00
  • 0e22a21637 added TranslateNode, RotateNode, and ScaleNode Josh Holtrop 2009-02-17 03:25:53 +00:00
  • 2a816c1c1a added parser/parser.h for a common YYSTYPE definition location Josh Holtrop 2009-02-17 02:13:24 +00:00
  • ecc06433fc flex output compiling with g++ Josh Holtrop 2009-02-17 01:37:39 +00:00
  • 6e67597dc7 commit before attempting to compile flex scanner with C++ instead of C Josh Holtrop 2009-02-17 01:29:25 +00:00
  • 3aed1c21ca filled out tree-building code for all parser nodes Josh Holtrop 2009-02-17 00:58:08 +00:00
  • 5d7a230ee3 using -O2 which avoids "might be used uninitialized" compiler warnings, added *.dep to svn:ignore for parser directory Josh Holtrop 2009-02-16 21:51:45 +00:00
  • 70c4785b43 fixed up bison conflicts in grammar Josh Holtrop 2009-02-16 21:20:05 +00:00
  • 71a55378c4 fixed a few compiler warnings, have a few more to go Josh Holtrop 2009-02-16 21:06:19 +00:00
  • 69c5fdd1e6 updated parser to compile again, still have non-virtual destructor compiler warnings Josh Holtrop 2009-02-16 20:51:59 +00:00
  • 4d5faf8362 updating parser nodes, introducing conflicts, still not compiling Josh Holtrop 2009-02-16 20:19:01 +00:00
  • 9849ba06b5 adding tree node classes, updated addChild() and added addChildren() to Node Josh Holtrop 2009-02-16 17:29:57 +00:00
  • 3014a39bb0 added parser/nodes.{cc,h}, broke compilation temporarily Josh Holtrop 2009-02-16 13:41:09 +00:00
  • dcbdf4e2ec updated parser Makefile to include dependency information Josh Holtrop 2009-02-16 01:21:28 +00:00
  • 6f2851f279 yyparse() now a friend function to Scene, light constructors not taking position arguments any more Josh Holtrop 2009-02-12 03:56:09 +00:00
  • c136bda827 added the_Color to Node, material gathering AMBIENT, DIFFUSE, SPECULAR color values Josh Holtrop 2009-02-12 03:07:22 +00:00
  • 8a112009a6 converted shapes and lights collection in Scene to be refptrs instead of real pointers Josh Holtrop 2009-02-11 17:23:01 +00:00
  • 7f9b8b913a added Shape::~Shape() to work around compiler warnings Josh Holtrop 2009-02-11 17:11:30 +00:00
  • ee64558db6 made parser/parser.yy:parse() a method of class Scene so no global g_scene is needed Josh Holtrop 2009-02-11 17:08:38 +00:00
  • 8b9b6332cc changed getPtr() to isNull() in util/refptr, filled in parser logic a lot more Josh Holtrop 2009-02-11 04:27:44 +00:00
  • 236cbc7db0 added getPtr() to util/refptr Josh Holtrop 2009-02-10 01:21:54 +00:00
  • 2f16235ed2 updating parser logic Josh Holtrop 2009-02-10 01:20:05 +00:00
  • 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 Josh Holtrop 2009-02-10 01:09:07 +00:00
  • 2e82f9e2ea adding required arguments to shape constructors in scene description language Josh Holtrop 2009-02-10 00:52:38 +00:00
  • 0181e82653 added dereference and indirection operators to util/refptr, converted parser to use refptr<Node> as YYSTYPE Josh Holtrop 2009-02-10 00:37:49 +00:00
  • c6e1a2c7e4 added refptr<T>::operator=(const T * ptr) method, including refptr in parser Josh Holtrop 2009-02-10 00:18:07 +00:00
  • 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 Josh Holtrop 2009-02-10 00:10:04 +00:00
  • 498d35274d fixed up util/refptr Josh Holtrop 2009-02-09 23:51:00 +00:00
  • d34242252a added util/refptr module Josh Holtrop 2009-02-09 23:31:15 +00:00
  • fc8a46853b added some setters to Scene, including some modules in parser, ready to do something with the parse results Josh Holtrop 2009-02-09 02:55:02 +00:00
  • 70eeff90fb added class node to parser to store parsed node types (YYSTYPE is now Node) Josh Holtrop 2009-02-09 00:24:19 +00:00
  • 3da5e6d569 added scenes and scenes/infinity.fart Josh Holtrop 2009-02-09 00:08:36 +00:00
  • c3e31eab4a added boolean shapes to parser Josh Holtrop 2009-02-08 23:57:57 +00:00
  • f5dc4c7f93 updated parser rules a bit Josh Holtrop 2009-02-08 23:24:11 +00:00
  • ba7190d7d8 working on parser Josh Holtrop 2009-02-08 19:42:55 +00:00
  • 80004438be added parser/preparser.cc Josh Holtrop 2009-02-05 03:13:28 +00:00
  • afd0df3ce4 added LESS and GREATER to parser tokens Josh Holtrop 2009-02-04 20:41:47 +00:00
  • e758f53a3e added svn:ignore to parser directory for flex and bison produced files Josh Holtrop 2009-02-04 18:51:18 +00:00
  • dab2381fba parser modules now compiling and linking with main build process Josh Holtrop 2009-02-04 18:50:15 +00:00
  • 1fe251f27d added -lfl to LDFLAGS in main Makefile, added parser/parser.{lex,yy} and parser/Makefile (for real this time) Josh Holtrop 2009-02-04 18:45:55 +00:00
  • 31a7f0fedf updated subdir Makefiles, added parser directory and parser/Makefile Josh Holtrop 2009-02-04 18:35:32 +00:00
  • d421a652e4 fixed compile warning in util/Color for return value of operator+= and -= Josh Holtrop 2009-02-02 15:29:01 +00:00
  • 78fd509d0f back up to default ambient of (0.1, 0.1, 0.1), Phong shading working Josh Holtrop 2009-01-31 22:42:14 +00:00
  • c4509d0594 added an ambient color component to Material, changed Lighting to use it Josh Holtrop 2009-01-31 22:34:36 +00:00
  • 7181a894a4 capping colors in main/Lighting; colors are maxing out too easily, might need a better reduction method Josh Holtrop 2009-01-31 18:29:28 +00:00
  • 6fbdf46122 fixed bug in util/Vector::reflect(), Phong shading getting much closer Josh Holtrop 2009-01-31 00:17:09 +00:00
  • 41b4354d52 trying to get Phong shading model working, having very large color values come back though Josh Holtrop 2009-01-30 20:53:13 +00:00
  • 8677680577 added main/Lighting module, added operator-() to util/Vector, added m_shininess to main/Light Josh Holtrop 2009-01-30 20:28:05 +00:00
  • 434064c03c updated main/Material setters & getters for diffuse & specular colors Josh Holtrop 2009-01-30 04:31:18 +00:00
  • 18c0c8d45f added diffuse and specular colors to Material, switched all "private:" to "protected:" Josh Holtrop 2009-01-30 02:26:46 +00:00
  • 04b8ea5f9e added main/Material module Josh Holtrop 2009-01-30 02:20:29 +00:00
  • f087488b39 using Color instead of Vector where appropriate, updated main/Light to use diffuse and specular lights Josh Holtrop 2009-01-30 01:25:57 +00:00
  • 08a0047ba8 added proj() and reflect() to util/Vector, changed util/Transform to use Vector::proj() in lookAt() Josh Holtrop 2009-01-30 00:18:20 +00:00
  • c5ac957dff updated BMP.cc to avoid compiler warnings Josh Holtrop 2009-01-29 23:16:51 +00:00
  • 47dd5a31fe fixed strange compile warning in fart.cc by making constructor arguments to Scene::Scene() consts Josh Holtrop 2009-01-29 14:49:41 +00:00
  • 866f22a637 added operator*(Vector,double) and operator/(Vector,double) to util/Vector; added lookAt() to util/Transform (needs testing) Josh Holtrop 2009-01-28 23:47:46 +00:00
  • 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 Josh Holtrop 2009-01-28 21:41:19 +00:00
  • a52b456bfa updated Makefile to use -O1 in CXXFLAGS instead of -O3; -O2 and above currently break the app Josh Holtrop 2009-01-28 18:51:14 +00:00
  • ca3087eac5 shapes returning transformed normals Josh Holtrop 2009-01-28 15:06:48 +00:00
  • 7a4bb7dbc2 added LinearSolver to util/Solver module; added shapes/Plane module Josh Holtrop 2009-01-28 15:02:05 +00:00
  • e34bdf0d71 fixed test/tests.cc Josh Holtrop 2009-01-28 01:15:20 +00:00
  • fa353392c6 updating main/Scene to accept points back instead of distances from intersect() Josh Holtrop 2009-01-27 23:03:24 +00:00