Skip to content

Commit 5cbe1d8

Browse files
committed
Updated DLL to latest version
1 parent 2faab9b commit 5cbe1d8

File tree

2 files changed

+14
-23
lines changed

2 files changed

+14
-23
lines changed

API/Binaries/TERRA_Engine.dll

3.5 KB
Binary file not shown.

API/TERRA_Engine.dpr

+14-23
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ Library TERRA_Engine;
3030
Uses TERRA_Utils, TERRA_Color, TERRA_Vector3D, TERRA_Vector2D, TERRA_Matrix4x4, TERRA_Matrix3x3,
3131
TERRA_BoundingBox, TERRA_Texture, TERRA_Camera, TERRA_Ray, TERRA_Tilemap,
3232
TERRA_Application, TERRA_ResourceManager, TERRA_Lights, TERRA_Shader, TERRA_FileManager,
33-
TERRA_Resource, TERRA_Client, TERRA_UI, TERRA_Skybox, TERRA_MusicManager,
33+
TERRA_Resource, TERRA_Client, TERRA_UI, TERRA_Skybox, TERRA_MusicManager, TERRA_InputManager,
3434
TERRA_Font, TERRA_Scene, TERRA_XML, TERRA_GraphicsManager, TERRA_SpriteManager,
3535
TERRA_Mesh, TERRA_MeshAnimation, TERRA_Stream, TERRA_MemoryStream, TERRA_FileStream, TERRA_Viewport,
3636

3737
TERRA_Log, TERRA_Localization, TERRA_Widgets, TERRA_Image, TERRA_ShaderFactory,
3838
TERRA_SoundManager, TERRA_Sound, TERRA_TextureAtlas, TERRA_Leaderboards,
3939
TERRA_PNG, TERRA_Milkshape, TERRA_OBJ, TERRA_Collada, TERRA_TTF, TERRA_AngelCodeFont,
4040
TERRA_ParticleRenderer, TERRA_ParticleEmitters, TERRA_OS,
41-
TERRA_FileUtils, TERRA_HTTP, TERRA_AIPath, TERRA_Session,
41+
TERRA_FileUtils, TERRA_HTTP, TERRA_AIGridPath, TERRA_Session,
4242
TERRA_Decals, TERRA_Billboards, TERRA_Network, TERRA_NetClient, TERRA_Sockets, TERRA_WAVE,
4343
{$IFNDEF MOBILE}TERRA_OGG,{$ENDIF}
4444
{$IFNDEF IPHONE}TERRA_JPG,{$ENDIF}
@@ -351,7 +351,7 @@ Procedure AI_DestroyPath(Var Path:TERRAPath); external {$IFNDEF STATIC_LINKING}T
351351

352352
Type
353353
CustomNetClient = Class(NetClient)
354-
Procedure HandleMessageCustom(Msg:NetMessage; Sock:Socket);
354+
Procedure HandleMessageCustom(Msg:NetMessage);
355355
Procedure ConnectionStart; Override;
356356
Procedure ConnectionEnd(ErrorCode:Integer; ErrorLog:String); Override;
357357
End;
@@ -374,7 +374,7 @@ Begin
374374
_OnConnectionEnd(ErrorCode);
375375
End;
376376

377-
Procedure CustomNetClient.HandleMessageCustom(Msg:NetMessage; Sock:Socket);
377+
Procedure CustomNetClient.HandleMessageCustom(Msg:NetMessage);
378378
Var
379379
S:Stream;
380380
Begin
@@ -629,12 +629,12 @@ End;
629629
Procedure Localization_SetLanguage(Lang:PAnsiChar); Cdecl;
630630
Begin
631631
If Lang<>Nil Then
632-
StringManager.Instance.SetLanguage(Lang);
632+
LocalizationManager.Instance.SetLanguage(Lang);
633633
End;
634634

635635
Function Localization_GetString(ID:PAnsiChar):PAnsiChar; Cdecl;
636636
Begin
637-
_Str[_StrIndex] := StringManager.Instance.GetString(ID);
637+
_Str[_StrIndex] := LocalizationManager.Instance.GetString(ID);
638638
_Str[_StrIndex, Length(_Str[_StrIndex]) + 1] := #0;
639639
Result := @(_Str[_StrIndex, 1]);
640640
Inc(_StrIndex);
@@ -644,22 +644,22 @@ End;
644644

645645
Procedure Input_SetKeyState(Key:Integer; State:Boolean); Cdecl;
646646
Begin
647-
Application.Instance.Input.Keys.SetState(Key, State);
647+
InputManager.Instance.Keys.SetState(Key, State);
648648
End;
649649

650650
Function Input_KeyDown(Key:Integer):Boolean; Cdecl;
651651
Begin
652-
Result := Application.Instance.Input.Keys.IsDown(Key);
652+
Result := InputManager.Instance.Keys.IsDown(Key);
653653
End;
654654

655655
Function Input_KeyPressed(Key:Integer):Boolean; Cdecl;
656656
Begin
657-
Result := Application.Instance.Input.Keys.WasPressed(Key);
657+
Result := InputManager.Instance.Keys.WasPressed(Key);
658658
End;
659659

660660
Function Input_GetMousePosition():Vector2D; Cdecl;
661661
Begin
662-
Result := VectorCreate2D(Application.Instance.Input.Mouse.X , Application.Instance.Input.Mouse.X);
662+
Result := VectorCreate2D(InputManager.Instance.Mouse.X , InputManager.Instance.Mouse.X);
663663
End;
664664

665665
Function Stream_CreateBuffer(Size:Integer; Ptr:Pointer = Nil):TERRAStream; Cdecl;
@@ -867,7 +867,7 @@ Begin
867867
If Not ValidateType(MyFont, Font) Then
868868
Exit;
869869

870-
Result := Font(MyFont).GetTextWidth(Text)
870+
Result := UIManager.Instance.FontRenderer.SetFont(MyFont).GetTextWidth(Text);
871871
End;
872872

873873
Function Font_GetTextHeight(MyFont:TERRAFont; Text:PAnsiChar):Single; Cdecl;
@@ -877,7 +877,7 @@ Begin
877877
If Not ValidateType(MyFont, Font) Then
878878
Exit;
879879

880-
Result := Font(MyFont).GetTextHeight(Text)
880+
Result := UIManager.Instance.FontRenderer.SetFont(MyFont).GetTextHeight(Text);
881881
End;
882882

883883
Function Font_GetTextRect(MyFont:TERRAFont; Text:PAnsiChar):Vector2D; Cdecl;
@@ -887,15 +887,15 @@ Begin
887887
If Not ValidateType(MyFont, Font) Then
888888
Exit;
889889

890-
Result := Font(MyFont).GetTextRect(Text)
890+
Result := UIManager.Instance.FontRenderer.SetFont(MyFont).GetTextRect(Text);
891891
End;
892892

893893
Procedure Font_DrawText(MyFont:TERRAFont; X:Single; Y:Single; Layer:Single; Text:PAnsiChar; Const MyColor:Color); Cdecl;
894894
Begin
895895
If Not ValidateType(MyFont, Font) Then
896896
Exit;
897897

898-
Font(MyFont).DrawText(X, Y, Layer, Text, MyColor);
898+
UIManager.Instance.FontRenderer.SetFont(MyFont).SetColor(MyColor).DrawText(X, Y, Layer, Text);
899899
End;
900900

901901
// Tile sheet generator
@@ -1190,14 +1190,6 @@ Begin
11901190
MeshInstance(Instance).Scale := Scale;
11911191
End;
11921192

1193-
Procedure MeshInstance_SetTransform(Instance:TERRAMeshInstance; Const Transform:Matrix4x4); Cdecl;
1194-
Begin
1195-
If Instance = Nil Then
1196-
Exit;
1197-
1198-
MeshInstance(Instance).Transform := Transform;
1199-
End;
1200-
12011193
Procedure MeshInstance_Destroy(Var Instance:TERRAMeshInstance); Cdecl;
12021194
Begin
12031195
If Instance = Nil Then
@@ -3085,7 +3077,6 @@ Exports
30853077
MeshInstance_SetPosition,
30863078
MeshInstance_SetRotation,
30873079
MeshInstance_SetScale,
3088-
MeshInstance_SetTransform,
30893080
MeshInstance_PlayAnimation,
30903081
MeshInstance_CrossfadeAnimation,
30913082
MeshInstance_Destroy,

0 commit comments

Comments
 (0)