Optimistic bogus newline fix.
This was SVN commit r317.
This commit is contained in:
parent
02ec5888ec
commit
2d0ce81aee
@ -264,7 +264,12 @@ bool CModel::SetAnimation(CSkeletonAnim* anim)
|
|||||||
void CModel::AddProp(SPropPoint* point,CModel* model)
|
void CModel::AddProp(SPropPoint* point,CModel* model)
|
||||||
{
|
{
|
||||||
// position model according to prop point position
|
// position model according to prop point position
|
||||||
model->SetTransform(point->m_Transform);
|
CMatrix3D proptransform=point->m_Transform;;
|
||||||
|
if (m_BoneMatrices && point->m_BoneIndex!=0xff) {
|
||||||
|
proptransform.Concatenate(m_BoneMatrices[point->m_BoneIndex]);
|
||||||
|
}
|
||||||
|
proptransform.Concatenate(m_Transform);
|
||||||
|
model->SetTransform(proptransform);
|
||||||
|
|
||||||
// check if we're already using this point, and replace
|
// check if we're already using this point, and replace
|
||||||
// model on it if so
|
// model on it if so
|
||||||
|
@ -108,7 +108,7 @@ CRenderer::CRenderer ()
|
|||||||
m_ShadowMap=0;
|
m_ShadowMap=0;
|
||||||
m_Options.m_NoVBO=false;
|
m_Options.m_NoVBO=false;
|
||||||
m_Options.m_NoPBuffer=false;
|
m_Options.m_NoPBuffer=false;
|
||||||
m_Options.m_Shadows=true;
|
m_Options.m_Shadows=false;
|
||||||
m_Options.m_ShadowColor=RGBColor(0.4f,0.4f,0.4f);
|
m_Options.m_ShadowColor=RGBColor(0.4f,0.4f,0.4f);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -836,8 +836,6 @@ void CRenderer::RenderPatches()
|
|||||||
// RenderModelsStreams: recurse down given model rendering given streams on each model
|
// RenderModelsStreams: recurse down given model rendering given streams on each model
|
||||||
void CRenderer::RenderModelsStreams(u32 streamflags)
|
void CRenderer::RenderModelsStreams(u32 streamflags)
|
||||||
{
|
{
|
||||||
glMatrixMode(GL_MODELVIEW);
|
|
||||||
|
|
||||||
for (uint i=0;i<m_Models.size();++i) {
|
for (uint i=0;i<m_Models.size();++i) {
|
||||||
CModel* model=m_Models[i];
|
CModel* model=m_Models[i];
|
||||||
// push transform onto stack
|
// push transform onto stack
|
||||||
|
Loading…
Reference in New Issue
Block a user