diff options
Diffstat (limited to 'src/base')
-rw-r--r-- | src/base/UTexture.pas | 9 | ||||
-rw-r--r-- | src/base/UUnicodeUtils.pas | 12 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/base/UTexture.pas b/src/base/UTexture.pas index 6edcc46f..2da7625c 100644 --- a/src/base/UTexture.pas +++ b/src/base/UTexture.pas @@ -56,6 +56,8 @@ type ScaleW: real; // for dynamic scalling while leaving width constant ScaleH: real; // for dynamic scalling while leaving height constant Rot: real; // 0 - 2*pi + RightScale: real; // + LeftScale: real; // Int: real; // intensity ColR: real; ColG: real; @@ -311,6 +313,7 @@ begin glBindTexture(GL_TEXTURE_2D, ActTex); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); @@ -360,6 +363,9 @@ begin TexX2 := 1; TexY2 := 1; + RightScale := 1; + LeftScale := 1; + Name := Identifier; end; @@ -466,6 +472,9 @@ begin Result.TexX2 := 1; Result.TexY2 := 1; + Result.RightScale := 1; + Result.LeftScale := 1; + Result.Name := Name; end; diff --git a/src/base/UUnicodeUtils.pas b/src/base/UUnicodeUtils.pas index 52e40847..2fb87467 100644 --- a/src/base/UUnicodeUtils.pas +++ b/src/base/UUnicodeUtils.pas @@ -667,25 +667,33 @@ begin end; end; -function AnsiToAscii(const s:AnsiString):AnsiString; +function AnsiToAscii(const s :AnsiString): AnsiString; begin Result := s; if Result <> '' then begin UniqueString(Result); +{$IFDEF Windows} CharToOem(Pchar(Result), Pchar(Result)); +{$ELSE} +// todo +{$ENDIF} end; end; -function AsciiToAnsi(const s:AnsiString):AnsiString; +function AsciiToAnsi(const s: AnsiString): AnsiString; begin Result := s; if Result <> '' then begin UniqueString(Result); +{$IFDEF Windows} OemToChar(Pchar(Result), Pchar(Result)); +{$ELSE} +// todo +{$ENDIF} end; end; |