[artoolkit-commits] artoolkit/lib/SRC/ARvrml arViewer.h, 1.2, 1.3 arViewer.cpp, 1.3, 1.4

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/ARvrml
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv21831

Modified Files:
	arViewer.h arViewer.cpp 
Log Message:
Fix up vrml renderer (backgrounds were still showing).

Index: arViewer.cpp
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/ARvrml/arViewer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** arViewer.cpp	17 Nov 2006 03:21:19 -0000	1.3
--- arViewer.cpp	15 Jan 2007 22:10:30 -0000	1.4
***************
*** 192,196 ****
      glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
      glDisable(GL_FOG);          // this is a global attribute
!     glDisable(GL_TEXTURE_2D);
      glEnable(GL_CULL_FACE);
      glFrontFace(GL_CCW);
--- 192,196 ----
      glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
      glDisable(GL_FOG);          // this is a global attribute
!     //glDisable(GL_TEXTURE_2D);
      glEnable(GL_CULL_FACE);
      glFrontFace(GL_CCW);
***************
*** 223,227 ****
      glDisable(GL_BLEND);
      glDisable(GL_CULL_FACE);
!     glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
  	
      glMatrixMode(GL_MODELVIEW);
--- 223,227 ----
      glDisable(GL_BLEND);
      glDisable(GL_CULL_FACE);
!     //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
  	
      glMatrixMode(GL_MODELVIEW);
***************
*** 259,267 ****
  
  viewer::object_t arVrmlViewer::insert_background(const std::vector<float> & groundAngle,
!                               const std::vector<openvrml::color> & groundColor,
!                               const std::vector<float> & skyAngle,
!                               const std::vector<openvrml::color> & skyColor,
!                               size_t * whc,
!                               unsigned char ** pixels)
  {
  	return 0;
--- 259,271 ----
  
  viewer::object_t arVrmlViewer::insert_background(const std::vector<float> & groundAngle,
! 												 const std::vector<color> & groundColor,
! 												 const std::vector<float> & skyAngle,
! 												 const std::vector<color> & skyColor,
! 												 const image & front,
! 												 const image & back,
! 												 const image & left,
! 												 const image & right,
! 												 const image & top,
! 												 const image & bottom)
  {
  	return 0;

Index: arViewer.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/ARvrml/arViewer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** arViewer.h	17 Nov 2006 03:21:19 -0000	1.2
--- arViewer.h	15 Jan 2007 22:10:30 -0000	1.3
***************
*** 72,82 ****
                                         float visibilityLimit);
  
!     virtual viewer::object_t insert_background(const std::vector<float> & groundAngle,
!                               const std::vector<openvrml::color> & groundColor,
!                               const std::vector<float> & skyAngle,
!                               const std::vector<openvrml::color> & skyColor,
!                               size_t * whc = 0,
!                               unsigned char ** pixels = 0);
! 
      virtual viewer::object_t insert_dir_light(float ambientIntensity,
                                                float intensity,
--- 72,86 ----
                                         float visibilityLimit);
  
!    virtual viewer::object_t insert_background(const std::vector<float> & groundAngle,
! 											  const std::vector<openvrml::color> & groundColor,
! 											  const std::vector<float> & skyAngle,
! 											  const std::vector<openvrml::color> & skyColor,
! 											  const openvrml::image & front,
! 											  const openvrml::image & back,
! 											  const openvrml::image & left,
! 											  const openvrml::image & right,
! 											  const openvrml::image & top,
! 											  const openvrml::image & bottom);
! 		
      virtual viewer::object_t insert_dir_light(float ambientIntensity,
                                                float intensity,