mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-04-20 19:11:50 +02:00
Code Issues Releases Wiki Activity

apply view matrix scale

Browse Source 
static base address (reduce executable size)
This commit is contained in:
XProger 2016-08-18 03:00:26 +03:00
parent 426ccebf95
commit d1af898609
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/level.h
View File

@ -58,29 +58,11 @@ struct Level {
return NULL;
}
/*
float time;
vec3 laraPos(0.0f);
meshes = Array<tr_mesh>();
meshes.count = meshPointers.count;
meshes.items = new tr_mesh*[meshes.count];
for (int i = 0; i < meshPointers.count; i++) {
stream->setPos(meshesData + meshPointers[i]);
meshes.items[i] = new tr_mesh(stream);
}
*/
/*
*/
#define SCALE (1.0f / 1024.0f / 2.0f)
void renderRoom(const TR::Room &room) {
glPushMatrix();
glScalef(-SCALE, -SCALE, SCALE);
glTranslatef(room.info.x, 0.0f, room.info.z);
// rectangles
@ -127,7 +109,6 @@ struct Level {
ASSERT(sMesh != NULL);
glPushMatrix();
glScalef(-SCALE, -SCALE, SCALE);
glTranslatef(rMesh.x, rMesh.y, rMesh.z);
glRotatef((rMesh.rotation >> 14) * 90.0f, 0, 1, 0);
@ -322,7 +303,6 @@ struct Level {
glColor3f(a, a, a);
glPushMatrix();
glScalef(-SCALE, -SCALE, SCALE);
glTranslatef(v.vertex.x + room.info.x, v.vertex.y, v.vertex.z + room.info.z);
renderSprite(level.spriteTextures[sprite.texture]);
@ -462,7 +442,6 @@ struct Level {
void renderEntity(const TR::Entity &entity) {
glPushMatrix();
glScalef(-SCALE, -SCALE, SCALE);
glTranslatef(entity.x, entity.y, entity.z);
if (entity.intensity > -1) {
@ -762,10 +741,11 @@ struct Level {
glEnable(GL_COLOR_MATERIAL);
glEnable(GL_LIGHT0);
Core::setCulling(cfFront);
glColor3f(1, 1, 1);
glScalef(-SCALE, -SCALE, SCALE);
for (int i = 0; i < level.roomsCount; i++)
renderRoom(level.rooms[i]);

1
src/win/OpenLara.vcxproj
View File

@ -88,6 +88,7 @@
<AdditionalDependencies>opengl32.lib;winmm.lib;wcrt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
</Link>
</ItemDefinitionGroup>
<ItemGroup>