From: Markus R. <rol...@us...> - 2006-02-18 19:41:54
|
Update of /cvsroot/simspark/simspark/spark/kerosin/materialserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11891/materialserver Modified Files: materialsolid.h materialsolid.cpp Log Message: - const correctness Index: materialsolid.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/materialserver/materialsolid.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** materialsolid.cpp 5 Dec 2005 21:38:22 -0000 1.1 --- materialsolid.cpp 18 Feb 2006 19:41:48 -0000 1.2 *************** *** 70,74 **** } ! const RGBA& MaterialSolid::GetAmbient() { return mAmbient; --- 70,74 ---- } ! const RGBA& MaterialSolid::GetAmbient() const { return mAmbient; *************** *** 80,84 **** } ! const RGBA& MaterialSolid::GetDiffuse() { return mDiffuse; --- 80,84 ---- } ! const RGBA& MaterialSolid::GetDiffuse() const { return mDiffuse; *************** *** 90,94 **** } ! const RGBA& MaterialSolid::GetSpecular() { return mSpecular; --- 90,94 ---- } ! const RGBA& MaterialSolid::GetSpecular() const { return mSpecular; *************** *** 100,104 **** } ! const RGBA& MaterialSolid::GetEmission() { return mEmission; --- 100,104 ---- } ! const RGBA& MaterialSolid::GetEmission() const { return mEmission; Index: materialsolid.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/materialserver/materialsolid.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** materialsolid.h 5 Dec 2005 21:38:22 -0000 1.1 --- materialsolid.h 18 Feb 2006 19:41:48 -0000 1.2 *************** *** 44,48 **** /** returns the ambient material reflectance */ ! const RGBA& GetAmbient(); /** sets the diffuse material reflectance */ --- 44,48 ---- /** returns the ambient material reflectance */ ! const RGBA& GetAmbient() const; /** sets the diffuse material reflectance */ *************** *** 50,54 **** /** returns the diffuse material reflectancee */ ! const RGBA& GetDiffuse(); /** sets the specular material reflectance */ --- 50,54 ---- /** returns the diffuse material reflectancee */ ! const RGBA& GetDiffuse() const; /** sets the specular material reflectance */ *************** *** 56,60 **** /** returns the specular material reflectance */ ! const RGBA& GetSpecular(); /** sets the light emission */ --- 56,60 ---- /** returns the specular material reflectance */ ! const RGBA& GetSpecular() const; /** sets the light emission */ *************** *** 62,66 **** /** returns the light emission */ ! const RGBA& GetEmission(); protected: --- 62,66 ---- /** returns the light emission */ ! const RGBA& GetEmission() const; protected: |