375 Commits

Author SHA1 Message Date
Josh Holtrop
33f554d714 reworking distrib & Scene to work together
git-svn-id: svn://anubis/fart/trunk@226 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-04-06 18:38:30 +00:00
Josh Holtrop
fdf34009bf using a mutex/condvar instead of a usleep to wait for listen thread to start
git-svn-id: svn://anubis/fart/trunk@225 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-04-06 17:17:04 +00:00
Josh Holtrop
d6aa5b6e69 added pthread support for starting the server listen/accept loop
git-svn-id: svn://anubis/fart/trunk@224 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-04-05 18:41:39 +00:00
Josh Holtrop
6fdaf01214 passing client options to distributed clients, ready to actually distribute work
git-svn-id: svn://anubis/fart/trunk@223 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-04-05 18:12:44 +00:00
Josh Holtrop
1dbe7040e4 working on distribution infrastructure some more, ssh working
git-svn-id: svn://anubis/fart/trunk@222 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-04-05 16:42:30 +00:00
Josh Holtrop
74399fe145 working on distrib infrastructure more
git-svn-id: svn://anubis/fart/trunk@221 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-04-05 15:52:18 +00:00
Josh Holtrop
0e818d1a92 added distrib infrastructure
git-svn-id: svn://anubis/fart/trunk@220 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-04-05 13:11:44 +00:00
Josh Holtrop
08429c5e58 updated .todo
git-svn-id: svn://anubis/fart/trunk@219 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-23 22:22:32 +00:00
Josh Holtrop
6a9eded895 updated .todo again
git-svn-id: svn://anubis/fart/trunk@218 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-16 13:28:17 +00:00
Josh Holtrop
584160265f updated scenes/die.fart, moved where backface checking was occurring in main/Scene
git-svn-id: svn://anubis/fart/trunk@217 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-15 22:07:06 +00:00
Josh Holtrop
7d9eb65fde working on die scene, fixed bug in Scene-load for loading colors applied to lights
git-svn-id: svn://anubis/fart/trunk@216 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-15 21:11:01 +00:00
Josh Holtrop
5590c533ce Fixed boolean objects to determine if rays start inside or outside the boolean; changed constructors to accept a list of shapes instead of just two shapes; changed parser to accept any number of top-level shapes inside of a boolean shape block; changed scenes/die.fart to reflect this change (a drastic simplification)
git-svn-id: svn://anubis/fart/trunk@215 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-15 19:51:21 +00:00
Josh Holtrop
f103b71ed6 added SUBDIRS to top-level Makefile to make adding subdirectories easier
git-svn-id: svn://anubis/fart/trunk@214 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-13 19:26:12 +00:00
Josh Holtrop
195593cc9b updated .todo, added scenes/die.fart which illustrates boolean object problem where continuation rays starting in the middle of a boolean object do not realize that fact
git-svn-id: svn://anubis/fart/trunk@213 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-12 03:23:10 +00:00
Josh Holtrop
91e490b65a added shapes/shapes.h, shapes/BoolShape, made Intersect, Union, and Subtract derive from BoolShape, made BoolShape::setMaterial() call setMaterial() on sub-shapes so that materials applied to boolean objects will be applied to all sub-objects
git-svn-id: svn://anubis/fart/trunk@212 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-12 02:59:35 +00:00
Josh Holtrop
86888fa461 changed Scene::calculateLightContribution() to return a Color instead of a double and take into account the color of any semi-transparent objects that are passed through en route to the light source... this leads to shadow colors tainted by the color of the objects through which the light is travelling
git-svn-id: svn://anubis/fart/trunk@211 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-12 02:30:28 +00:00
Josh Holtrop
a24452af01 updated .todo again
git-svn-id: svn://anubis/fart/trunk@210 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-11 21:14:49 +00:00
Josh Holtrop
5e85cdf387 updated .todo yet again
git-svn-id: svn://anubis/fart/trunk@209 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-11 21:12:11 +00:00
Josh Holtrop
f31d6bf61a updated .todo
git-svn-id: svn://anubis/fart/trunk@208 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-11 20:05:46 +00:00
Josh Holtrop
091fcadd39 added -d flag to usage information
git-svn-id: svn://anubis/fart/trunk@207 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-10 18:29:45 +00:00
Josh Holtrop
79f8f347e4 updated .todo yet again
git-svn-id: svn://anubis/fart/trunk@206 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-10 02:12:25 +00:00
Josh Holtrop
462f6f47e8 updated .todo again
git-svn-id: svn://anubis/fart/trunk@205 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-10 02:11:55 +00:00
Josh Holtrop
72a5023539 updated Makefiles to not print the "*.dep: No such file or directory" warnings
git-svn-id: svn://anubis/fart/trunk@204 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-10 01:54:23 +00:00
Josh Holtrop
9f9ce1a8f5 added maximum depth command-line argument (-d) and scene option (max_depth); prettified elapsed time output when greater than 60 seconds
git-svn-id: svn://anubis/fart/trunk@203 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-10 00:01:21 +00:00
Josh Holtrop
4716b200fd merged in branches/2009-03-09_intersect_returning_normals
git-svn-id: svn://anubis/fart/trunk@202 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-09 23:24:01 +00:00
Josh Holtrop
51c5baf59a updated subtract-subtract.fart and .todo
git-svn-id: svn://anubis/fart/branches/2009-03-09_intersect_returning_normals@201 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-09 23:21:23 +00:00
Josh Holtrop
60b29d658d modified shapes and Scene to return surface normal in the intersect object
git-svn-id: svn://anubis/fart/branches/2009-03-09_intersect_returning_normals@200 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-09 23:17:31 +00:00
Josh Holtrop
186bd0f8b5 added 2009-03-09_intersect_returning_normals branch
git-svn-id: svn://anubis/fart/branches/2009-03-09_intersect_returning_normals@199 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-09 22:06:29 +00:00
Josh Holtrop
4aaf5a065c updated .todo again
git-svn-id: svn://anubis/fart/trunk@198 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-09 16:41:18 +00:00
Josh Holtrop
5a4bee840d added scenes/subtract-subtract.fart (illustrating bug) and updated .todo
git-svn-id: svn://anubis/fart/trunk@197 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-09 15:12:54 +00:00
Josh Holtrop
88444e25b8 added scenes/csg.fart, fixed bug in loading boolean objects in Scene-load.cc
git-svn-id: svn://anubis/fart/trunk@196 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-09 00:09:33 +00:00
Josh Holtrop
09e97510d8 added built-in timer around Scene::render() call
git-svn-id: svn://anubis/fart/trunk@195 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-08 22:51:47 +00:00
Josh Holtrop
db72b5ba82 scanning scene files for camera definitions before shapes and lights
git-svn-id: svn://anubis/fart/trunk@194 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-08 22:31:15 +00:00
Josh Holtrop
12eb2f2476 updated .todo, scenes/infinity.fart with a second light source
git-svn-id: svn://anubis/fart/trunk@193 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-08 21:08:17 +00:00
Josh Holtrop
9972ebdb41 fixed nasty bug in shapes/Cyl where intersection results were being allowed if they were negative
git-svn-id: svn://anubis/fart/trunk@192 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-08 16:03:52 +00:00
Josh Holtrop
14b6735c1c minor formatting
git-svn-id: svn://anubis/fart/trunk@191 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-08 15:29:50 +00:00
Josh Holtrop
1ad08d9998 cleaning up shapes/Cyl a bit
git-svn-id: svn://anubis/fart/trunk@190 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-07 19:17:47 +00:00
Josh Holtrop
feeaa34d62 tweaked Scene::calculateLightContribution() and scenes/cyls.fart slightly
git-svn-id: svn://anubis/fart/trunk@189 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-07 18:38:40 +00:00
Josh Holtrop
608939bff4 Scene-load setting light position based on the current transform
git-svn-id: svn://anubis/fart/trunk@188 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-06 23:32:00 +00:00
Josh Holtrop
24ef1eca3c added scenes/trans-boxes.fart, changed Scene to consider all back-faces as front-faces by inverting the normal vector, fixed bug in Scene::calculateLightContribution() which was messing up shadow values and back-face intensities for transparent objects
git-svn-id: svn://anubis/fart/trunk@187 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-06 19:12:26 +00:00
Josh Holtrop
b50c4de1bc added parser, nodes, Scene-load support for transparency in materials
git-svn-id: svn://anubis/fart/trunk@186 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-05 20:04:13 +00:00
Josh Holtrop
f9cf1381a6 working on shadows but they are appearing in weird places...
git-svn-id: svn://anubis/fart/trunk@185 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-04 02:03:21 +00:00
Josh Holtrop
7d0b4c5646 moved Lighting::computePhong() into Scene, removed Lighting module
git-svn-id: svn://anubis/fart/trunk@184 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-04 00:16:32 +00:00
Josh Holtrop
e5cae862eb updated sample scenes with reflections
git-svn-id: svn://anubis/fart/trunk@183 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-03 04:37:09 +00:00
Josh Holtrop
e233056880 added Color::operator*=(), added jitter computation to reflectance and transparency recursion, recursing now but there is still a jitter or recursion issue
git-svn-id: svn://anubis/fart/trunk@182 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-03 04:30:46 +00:00
Josh Holtrop
1f00625379 made verbose the default option
git-svn-id: svn://anubis/fart/trunk@181 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-03 03:22:12 +00:00
Josh Holtrop
73cc495a79 removed debug print
git-svn-id: svn://anubis/fart/trunk@180 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-03 03:08:11 +00:00
Josh Holtrop
bb5eb07c75 fixed bug in material definitions, added them to cyls.fart, they are working now!
git-svn-id: svn://anubis/fart/trunk@179 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-03 03:06:56 +00:00
Josh Holtrop
31e2604f98 Scene-load.cc handling material definitions
git-svn-id: svn://anubis/fart/trunk@178 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-03 02:56:33 +00:00
Josh Holtrop
fce4d82a73 added material definitions to parser
git-svn-id: svn://anubis/fart/trunk@177 7f9b0f55-74a9-4bce-be96-3c2cd072584d
2009-03-03 02:30:43 +00:00