[cgkit-commits] cgkit2/supportlib/src polyhedrongeom.cpp,1.14,1.15 trimeshgeom.cpp,1.5,1.6

[Matthias B. <mb...@us...>]

Update of /cvsroot/cgkit/cgkit2/supportlib/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9149/src

Modified Files:
	polyhedrongeom.cpp trimeshgeom.cpp 
Log Message:
Primitive variable access now also supports the combination 'USER' / 'FACEVARYING int' which also works with Polyhedrons

Index: polyhedrongeom.cpp
===================================================================
RCS file: /cvsroot/cgkit/cgkit2/supportlib/src/polyhedrongeom.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** polyhedrongeom.cpp	20 May 2005 09:27:21 -0000	1.14
--- polyhedrongeom.cpp	5 Jun 2005 17:37:29 -0000	1.15
***************
*** 527,533 ****
    // Set flag to 0 (i.e. no variables are present so far)
    tess_data_flag = 0;
!   PrimVarAccess<vec3d> normals(*this, std::string("N"), NORMAL, 1);
!   PrimVarAccess<double> texcoords(*this, std::string("st"), FLOAT, 2);
!   PrimVarAccess<vec3d> colors(*this, std::string("Cs"), COLOR, 1);
    vec3d* N;
    vec3d* Cs;
--- 527,533 ----
    // Set flag to 0 (i.e. no variables are present so far)
    tess_data_flag = 0;
!   PrimVarAccess<vec3d> normals(*this, std::string("N"), NORMAL, 1, std::string("Nfaces"));
!   PrimVarAccess<double> texcoords(*this, std::string("st"), FLOAT, 2, std::string("stfaces"));
!   PrimVarAccess<vec3d> colors(*this, std::string("Cs"), COLOR, 1, std::string("Csfaces"));
    vec3d* N;
    vec3d* Cs;

Index: trimeshgeom.cpp
===================================================================
RCS file: /cvsroot/cgkit/cgkit2/supportlib/src/trimeshgeom.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** trimeshgeom.cpp	9 May 2005 14:40:52 -0000	1.5
--- trimeshgeom.cpp	5 Jun 2005 17:37:29 -0000	1.6
***************
*** 97,103 ****
  void TriMeshGeom::drawGL()
  {
!   PrimVarAccess<vec3d> normals(*this, std::string("N"), NORMAL, 1, std::string("Nfaces"));
!   PrimVarAccess<double> texcoords(*this, std::string("st"), FLOAT, 2, std::string("stfaces"));
!   PrimVarAccess<vec3d> colors(*this, std::string("Cs"), COLOR, 1, std::string("Csfaces"));
    vec3d* N;
    double* st;
--- 97,103 ----
  void TriMeshGeom::drawGL()
  {
!   PrimVarAccess<vec3d> normals(*this, std::string("N"), NORMAL, 1, std::string("Nfaces"), true);
!   PrimVarAccess<double> texcoords(*this, std::string("st"), FLOAT, 2, std::string("stfaces"), true);
!   PrimVarAccess<vec3d> colors(*this, std::string("Cs"), COLOR, 1, std::string("Csfaces"), true);
    vec3d* N;
    double* st;