ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/hd/rhdobj.c
(Generate patch)

Comparing ray/src/hd/rhdobj.c (file contents):
Revision 3.3 by gwlarson, Tue Aug 25 18:10:12 1998 UTC vs.
Revision 3.4 by gwlarson, Wed Aug 26 17:26:26 1998 UTC

# Line 774 | Line 774 | int    cn;
774          } else if ((op = getdobj(nam)) == NULL) {
775                  error(COMMAND, "unknown object");
776                  return(0);
777 <        } else if ((op->drawcode = cn) == DO_LIGHT)
778 <                getdlights(op, 1);
779 <        else
777 >        } else if ((op->drawcode = cn) == DO_LIGHT) {
778 >                if (!getdlights(op, 1))
779 >                        error(COMMAND, "insufficient samples to light object");
780 >        } else
781                  op->ol = NULL;
782  
783          if (dobj_lightsamp != NULL) {           /* restore beam set */
# Line 851 | Line 852 | dobj_render()                  /* render our objects in OpenGL */
852                  return(1);
853                                          /* set up general rendering params */
854          glGetBooleanv(GL_NORMALIZE, &normalizing);
855 <        glPushAttrib(GL_LIGHTING_BIT|GL_TRANSFORM_BIT|
856 <                        GL_DEPTH_BUFFER_BIT|GL_POLYGON_BIT);
855 >        glPushAttrib(GL_LIGHTING_BIT|GL_TRANSFORM_BIT|GL_ENABLE_BIT|
856 >                GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_POLYGON_BIT);
857          glDepthFunc(GL_LESS);
858          glEnable(GL_DEPTH_TEST);
859          glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)