thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

droped screenblocks, it's a bit too slow(on windows 7500 ati i can't even wrote to zbuffer), it doesn't detect many areas, if even would it will increase rects a lot and speed slow down much. ... and adopting half screen overlays kill solution completly

Browse source
This commit is contained in:
Pawel Kolodziejski 2005-01-10 09:07:46 +00:00
parent 0f951e5684
commit aefd8da093
14 changed files with 103 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

15
model.cpp
View file

@ -20,7 +20,6 @@
#include "debug.h"
#include "model.h"
#include "resource.h"
#include "screen.h"
#include "material.h"
#include "textsplit.h"
#include "driver_gl.h"
@ -126,7 +125,6 @@ Model::Mesh::~Mesh() {
}
void Model::Mesh::update() {
g_driver->updateMesh(this);
}
void Model::Face::loadBinary(const char *&data, ResPtr<Material> *materials) {
@ -377,8 +375,7 @@ void Model::Mesh::loadText(TextSplitter &ts, ResPtr<Material> *materials) {
if (ts.eof())
error("Expected face data, got EOF\n");
if (std::sscanf(ts.currentLine(), " %d: %d %i %d %d %d %f %d%n",
&num, &material, &type, &geo, &light, &tex, &extralight, &verts, &readlen) < 8)
if (std::sscanf(ts.currentLine(), " %d: %d %i %d %d %d %f %d%n", &num, &material, &type, &geo, &light, &tex, &extralight, &verts, &readlen) < 8)
error("Expected face data, got `%s'\n", ts.currentLine());
_faces[num]._material = materials[material];
@ -393,8 +390,7 @@ void Model::Mesh::loadText(TextSplitter &ts, ResPtr<Material> *materials) {
for (int j = 0; j < verts; j++) {
int readlen2;
if (std::sscanf(ts.currentLine() + readlen, " %d, %d%n",
_faces[num]._vertices + j, _faces[num]._texVertices + j, &readlen2) < 2)
if (std::sscanf(ts.currentLine() + readlen, " %d, %d%n", _faces[num]._vertices + j, _faces[num]._texVertices + j, &readlen2) < 2)
error("Could not read vertex indices in line `%s'\n",
ts.currentLine());
@ -439,6 +435,8 @@ void Model::HierNode::setMatrix(Matrix4 matrix) {
}
void Model::HierNode::update() {
g_driver->updateHierachyNode1(this);
_localMatrix._pos.set(_animPos.x() / _totalWeight, _animPos.y() / _totalWeight, _animPos.z() / _totalWeight);
_localMatrix._rot.buildFromPitchYawRoll(_animPitch / _totalWeight, _animYaw / _totalWeight, _animRoll / _totalWeight);
@ -448,14 +446,15 @@ void Model::HierNode::update() {
_pivotMatrix.translate(_pivot.x(), _pivot.y(), _pivot.z() );
g_driver->updateHierachyNode(this);
g_driver->updateHierachyNode2(this);
}
void Model::Mesh::draw() const {
for (int i = 0; i < _numFaces; i++)
_faces[i].draw(_vertices, _vertNormals, _textureVerts);
g_driver->drawModel(this);
// g_driver->drawModelNodeDebug(this);
// g_driver->drawModelPolygonPointsDebug(this);
}
void Model::Face::draw(float *vertices, float *vertNormals, float *textureVerts) const {