archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.50:

Browse Source 
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD

Notes:
* Game and sequencer RNA, and sequencer header are now out of date
  a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
  not needed anymore.
  * Fix "duplicate strip" always increase the user count for ipo.
  * IPO pinning on sequencer strips was lost during Undo.
This commit is contained in:
Brecht Van Lommel
2009-06-08 20:08:19 +00:00
parent e93db433a0 d76a6f5231
commit c8b4cf9206
594 changed files with 28292 additions and 13753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
View File

@@ -29,12 +29,71 @@
#include "RAS_IPolygonMaterial.h"
#include "RAS_IRasterizer.h"
#include "DNA_image_types.h"
#include "DNA_meshdata_types.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
void RAS_IPolyMaterial::Initialize(
const STR_String& texname,
const STR_String& matname,
int materialindex,
int tile,
int tilexrep,
int tileyrep,
int mode,
int transp,
bool alpha,
bool zsort,
int lightlayer)
{
m_texturename = texname;
m_materialname = matname;
m_materialindex = materialindex;
m_tile = tile;
m_tilexrep = tilexrep;
m_tileyrep = tileyrep;
m_drawingmode = mode;
m_transp = transp;
m_alpha = alpha;
m_zsort = zsort;
//m_lightlayer = lightlayer;
m_polymatid = m_newpolymatid++;
m_flag = 0;
m_multimode = 0;
m_shininess = 35.0;
m_specular.setValue(0.5,0.5,0.5);
m_specularity = 1.0;
m_diffuse.setValue(0.5,0.5,0.5);
}
RAS_IPolyMaterial::RAS_IPolyMaterial()
: m_texturename("__Dummy_Texture_Name__"),
m_materialname("__Dummy_Material_Name__"),
m_materialindex(0),
m_tile(0),
m_tilexrep(0),
m_tileyrep(0),
m_drawingmode (0),
m_transp(0),
m_alpha(false),
m_zsort(false),
//m_lightlayer(0),
m_polymatid(0),
m_flag(0),
m_multimode(0)
{
m_shininess = 35.0;
m_specular = MT_Vector3(0.5,0.5,0.5);
m_specularity = 1.0;
m_diffuse = MT_Vector3(0.5,0.5,0.5);
}
RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
const STR_String& matname,
int materialindex,
int tile,
int tilexrep,
int tileyrep,
@@ -45,6 +104,7 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
int lightlayer)
: m_texturename(texname),
m_materialname(matname),
m_materialindex(materialindex),
m_tile(tile),
m_tilexrep(tilexrep),
m_tileyrep(tileyrep),
@@ -52,7 +112,7 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
m_transp(transp),
m_alpha(alpha),
m_zsort(zsort),
m_lightlayer(lightlayer),
//m_lightlayer(lightlayer),
m_polymatid(m_newpolymatid++),
m_flag(0),
m_multimode(0)
@@ -95,6 +155,15 @@ bool RAS_IPolyMaterial::Equals(const RAS_IPolyMaterial& lhs) const
}
}
void RAS_IPolyMaterial::GetMaterialRGBAColor(unsigned char *rgba) const
{
*rgba++ = 0xFF;
*rgba++ = 0xFF;
*rgba++ = 0xFF;
*rgba++ = 0xFF;
}
bool RAS_IPolyMaterial::Less(const RAS_IPolyMaterial& rhs) const
{
if (Equals(rhs))
@@ -103,10 +172,10 @@ bool RAS_IPolyMaterial::Less(const RAS_IPolyMaterial& rhs) const
return m_polymatid < rhs.m_polymatid;
}
int RAS_IPolyMaterial::GetLightLayer() const
{
return m_lightlayer;
}
//int RAS_IPolyMaterial::GetLightLayer() const
//{
// return m_lightlayer;
//}
bool RAS_IPolyMaterial::IsAlpha() const
{
@@ -143,6 +212,25 @@ const STR_String& RAS_IPolyMaterial::GetTextureName() const
return m_texturename;
}
int RAS_IPolyMaterial::GetMaterialIndex() const
{
return m_materialindex;
}
Material *RAS_IPolyMaterial::GetBlenderMaterial() const
{
return NULL;
}
Scene* RAS_IPolyMaterial::GetBlenderScene() const
{
return NULL;
}
void RAS_IPolyMaterial::ReleaseMaterial()
{
}
unsigned int RAS_IPolyMaterial::GetFlag() const
{
return m_flag;