Update of /cvsroot/simspark/simspark/spark/kerosin/materialserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv8755
Modified Files:
Tag: projectx
materialsolid.cpp
Log Message:
- added a flag and methods indicating if depth checks for the
material should be enabled
- added a value and methods for the shininess of a material
Index: materialsolid.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/materialserver/materialsolid.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.1.2.1
diff -C2 -d -r1.2.2.1 -r1.2.2.1.2.1
*** materialsolid.cpp 23 Feb 2007 19:21:09 -0000 1.2.2.1
--- materialsolid.cpp 1 Jun 2007 12:59:41 -0000 1.2.2.1.2.1
***************
*** 1,5 ****
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
! this file is part of rcssserver3D
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
--- 1,5 ----
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
! this file is part of simspark
Fri May 9 2003
Copyright (C) 2002,2003 Koblenz University
***************
*** 35,39 ****
mDiffuse(1.0f,1.0f,1.0f,1.0f),
mSpecular(0.0f,0.0f,0.0f,1.0f),
! mEmission(0.0f,0.0f,0.0f,1.0f)
{
}
--- 35,41 ----
mDiffuse(1.0f,1.0f,1.0f,1.0f),
mSpecular(0.0f,0.0f,0.0f,1.0f),
! mEmission(0.0f,0.0f,0.0f,1.0f),
! mDepthCheck(true),
! mShininess(128.0f)
{
}
***************
*** 101,109 ****
}
! const RGBA& MaterialSolid::GetEmission() const
{
return mEmission;
}
--- 103,133 ----
}
! const RGBA&
! MaterialSolid::GetEmission() const
{
return mEmission;
}
+ bool
+ MaterialSolid::DepthCheck() const
+ {
+ return mDepthCheck;
+ }
+
+ void
+ MaterialSolid::SetDepthCheck(bool depthCheck)
+ {
+ mDepthCheck = depthCheck;
+ }
+ void
+ MaterialSolid::SetShininess(float val)
+ {
+ mShininess = val;
+ }
+ float
+ MaterialSolid::GetShininess() const
+ {
+ return mShininess;
+ }
|
