- Added ref counting to TMaterial
- Added cache growing to TCacheManager - Fixed ImagingOptions.inc to not include JPEG support - Fixed TfrmRadar to save the radar map to the correct location - Fixed statics using the wrong hue when being painted - Removed obsolete TLandTextureManager.GetFlatLandMaterial (and the according cache)
This commit is contained in:
@@ -1000,7 +1000,8 @@ end;
|
||||
procedure TfrmMain.ApplicationProperties1Idle(Sender: TObject; var Done: Boolean);
|
||||
begin
|
||||
if (FScreenBufferState <> CScreenBufferValid) or
|
||||
({FRepaintNeeded and }(MilliSecondsBetween(Now, FLastDraw) > 50)) then
|
||||
((FRepaintNeeded or mnuShowAnimations.Checked) and
|
||||
(MilliSecondsBetween(Now, FLastDraw) > 50)) then
|
||||
begin
|
||||
//Logger.Send([lcClient, lcDebug], 'Repainting Game Window');
|
||||
oglGameWindow.Repaint;
|
||||
@@ -1895,11 +1896,9 @@ procedure TfrmMain.InitSize;
|
||||
begin
|
||||
glViewport(0, 0, oglGameWindow.Width, oglGameWindow.Height);
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glPushMatrix;
|
||||
glLoadIdentity;
|
||||
gluOrtho2D(0, oglGameWindow.Width, oglGameWindow.Height, 0);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glPushMatrix;
|
||||
glLoadIdentity;
|
||||
end;
|
||||
|
||||
@@ -1999,6 +1998,9 @@ begin
|
||||
rawZ := item.RawZ;
|
||||
end;
|
||||
|
||||
if ABlockInfo^.HighRes <> nil then ABlockInfo^.HighRes.DelRef;
|
||||
if ABlockInfo^.LowRes <> nil then ABlockInfo^.LowRes.DelRef;
|
||||
|
||||
ABlockInfo^.HighRes := nil;
|
||||
ABlockInfo^.CheckRealQuad := False;
|
||||
ABlockInfo^.Text.Free;
|
||||
@@ -2181,7 +2183,6 @@ begin
|
||||
if not highlight then
|
||||
glEnable(GL_LIGHTING);
|
||||
|
||||
glLoadName(PtrInt(item));
|
||||
glBegin(GL_QUADS);
|
||||
glNormal3fv(@blockInfo^.Normals^[0]);
|
||||
glTexCoord2i(0, 0); glVertex2iv(@blockInfo^.DrawQuad[0]);
|
||||
@@ -2198,7 +2199,6 @@ begin
|
||||
end else
|
||||
begin
|
||||
glBindTexture(GL_TEXTURE_2D, blockInfo^.LowRes.Texture);
|
||||
glLoadName(PtrInt(item));
|
||||
glBegin(GL_QUADS);
|
||||
glTexCoord2i(0, 0); glVertex2iv(@blockInfo^.DrawQuad[0]);
|
||||
glTexCoord2i(1, 0); glVertex2iv(@blockInfo^.DrawQuad[1]);
|
||||
|
||||
Reference in New Issue
Block a user