abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Optimistic bogus newline fix.

Browse Source 
This was SVN commit r317.
This commit is contained in:
notpete 2004-05-29 23:35:46 +00:00
parent 02ec5888ec
commit 2d0ce81aee
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/graphics/Model.cpp
View File

@ -264,7 +264,12 @@ bool CModel::SetAnimation(CSkeletonAnim* anim)
void CModel::AddProp(SPropPoint* point,CModel* model)
{
// 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
// model on it if so

4
source/renderer/Renderer.cpp
View File

@ -108,7 +108,7 @@ CRenderer::CRenderer ()
m_ShadowMap=0;
m_Options.m_NoVBO=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);
}
@ -836,8 +836,6 @@ void CRenderer::RenderPatches()
// RenderModelsStreams: recurse down given model rendering given streams on each model
void CRenderer::RenderModelsStreams(u32 streamflags)
{
glMatrixMode(GL_MODELVIEW);
for (uint i=0;i<m_Models.size();++i) {
CModel* model=m_Models[i];
// push transform onto stack