removed static const Material::white (had a problem with C++ since the order that the static const constructors were being called in was not correct according to the order that the code depended on them), made Shape constructor use a common default material instead of recreating one every time
git-svn-id: svn://anubis/fart/trunk@174 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
1 parent
6a649ecac7
commit
84f6b04cd7
4 files changed
+12
-10
No files matched your search
@@ -1,8 +1,6 @@
|
||||
|
||||
#include "Material.h"
|
||||
|
||||
const Material Material::white = Material();
|
||||
|
||||
Material::Material()
|
||||
{
|
||||
m_ambient_color = Color::white;
|
||||
|
||||
@@ -7,9 +7,6 @@
|
||||
class Material
|
||||
{
|
||||
public:
|
||||
/* static members */
|
||||
static const Material white;
|
||||
|
||||
Material();
|
||||
|
||||
void setAmbientColor(const Color & ambient)
|
||||
|
||||
Reference in new issue
Block a user