mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-28 16:39:01 +02:00
Code Issues Projects Releases Wiki Activity

- a little bit of plumbing for VBO's for static models (currently disabled via # define)

Browse Source 
- small small speed improvement when calculating interpolations
This commit is contained in:
Mark Vejvoda
2011-01-18 07:52:06 +00:00
parent 55d213435a
commit c54e6dbf5d
14 changed files with 214 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/glest_game/graphics/renderer.cpp
View File

@@ -736,7 +736,7 @@ void Renderer::renderMouse3d() {
modelRenderer->begin(true, true, false);
glColor4fv(color.ptr());
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, color.ptr());
const Model *buildingModel= building->getFirstStOfClass(scStop)->getAnimation();
Model *buildingModel= building->getFirstStOfClass(scStop)->getAnimation();
if(gui->getSelectedFacing() != CardinalDir::NORTH) {
float rotateAmount = gui->getSelectedFacing() * 90.f;
@@ -1815,7 +1815,7 @@ void Renderer::renderObjects(const int renderFps) {
visibleIndex < qCache.visibleObjectList.size(); ++visibleIndex) {
Object *o = qCache.visibleObjectList[visibleIndex];
const Model *objModel= o->getModel();
Model *objModel= o->getModelPtr();
const Vec3f &v= o->getConstPos();
if(modelRenderStarted == false) {
@@ -2078,7 +2078,7 @@ void Renderer::renderUnits(const int renderFps) {
}
//render
const Model *model= unit->getCurrentModel();
Model *model= unit->getCurrentModelPtr();
model->updateInterpolationData(unit->getAnimProgress(), unit->isAlive());
modelRenderer->render(model);
@@ -2617,7 +2617,7 @@ void Renderer::renderMenuBackground(const MenuBackground *menuBackground){
glPushMatrix();
glLoadIdentity();
glTranslatef(i*2.f-4.f, -1.4f, -7.5f);
menuBackground->getCharacterModel(i)->updateInterpolationData(menuBackground->getAnim(), true);
menuBackground->getCharacterModelPtr(i)->updateInterpolationData(menuBackground->getAnim(), true);
modelRenderer->render(menuBackground->getCharacterModel(i));
glPopMatrix();
}
@@ -3287,7 +3287,7 @@ void Renderer::renderUnitsFast(bool renderingShadows) {
glRotatef(unit->getRotation(), 0.f, 1.f, 0.f);
//render
const Model *model= unit->getCurrentModel();
Model *model= unit->getCurrentModelPtr();
model->updateInterpolationVertices(unit->getAnimProgress(), unit->isAlive());
modelRenderer->render(model);