Permalink
Browse files

Combine OpenGLApi/Direct3D9Api

  • Loading branch information...
UnknownShadow200 committed Oct 10, 2018
1 parent 0a29a21 commit 8782d254ac7cdb04d232aa1bca24b63c792dd79d
@@ -47,7 +47,7 @@ public struct Vector3 : IEquatable<Vector3>
public static readonly Vector3 UnitZ = new Vector3(0, 0, 1);
public static readonly Vector3 Zero = new Vector3(0, 0, 0);
public static readonly Vector3 One = new Vector3(1, 1, 1);
public static readonly Vector3 One = new Vector3(1, 1, 1);
public static Vector3 Lerp(Vector3 a, Vector3 b, float blend) {
a.X = blend * (b.X - a.X) + a.X;
View
@@ -4,7 +4,7 @@
#include "Platform.h"
#include "Event.h"
#include "Funcs.h"
#include "GraphicsAPI.h"
#include "Graphics.h"
#include "Chat.h"
#include "World.h"
#include "Options.h"
View
@@ -1,5 +1,5 @@
#include "AxisLinesRenderer.h"
#include "GraphicsAPI.h"
#include "Graphics.h"
#include "Game.h"
#include "GraphicsCommon.h"
#include "SelectionBox.h"
View
@@ -5,7 +5,7 @@
#include "Lighting.h"
#include "Platform.h"
#include "MapRenderer.h"
#include "GraphicsAPI.h"
#include "Graphics.h"
#include "ErrorHandler.h"
#include "Drawer.h"
#include "ExtMath.h"
View
@@ -2,7 +2,7 @@
#include "ExtMath.h"
#include "Game.h"
#include "Window.h"
#include "GraphicsAPI.h"
#include "Graphics.h"
#include "Funcs.h"
#include "Gui.h"
#include "Entity.h"
View
@@ -9,13 +9,16 @@
#include "Inventory.h"
#include "Entity.h"
#include "Window.h"
#include "GraphicsAPI.h"
#include "Graphics.h"
#include "GraphicsCommon.h"
#include "Funcs.h"
#include "Block.h"
#include "EnvRenderer.h"
#include "GameStructs.h"
/*########################################################################################################################*
*-------------------------------------------------------Chat logging------------------------------------------------------*
*#########################################################################################################################*/
#define CHAT_LOGTIMES_DEF_ELEMS 256
TimeMS Chat_DefaultLogTimes[CHAT_LOGTIMES_DEF_ELEMS];
TimeMS* Chat_LogTimes = Chat_DefaultLogTimes;
@@ -36,12 +39,6 @@ static void Chat_AppendLogTime(void) {
Chat_LogTimes[Chat_LogTimesCount++] = now;
}
static void ChatLine_Make(struct ChatLine* line, const String* text) {
String dst = String_ClearedArray(line->Buffer);
String_AppendString(&dst, text);
line->Received = DateTime_CurrentUTC_MS();
}
char Chat_LogNameBuffer[STRING_SIZE];
String Chat_LogName = String_FromArray(Chat_LogNameBuffer);
char Chat_LogPathBuffer[FILENAME_SIZE];
@@ -141,6 +138,12 @@ static void Chat_AppendLog(const String* text) {
Chat_LogError2(res, "writing to", &Chat_LogPath);
}
static void ChatLine_Make(struct ChatLine* line, const String* text) {
String dst = String_ClearedArray(line->Buffer);
String_AppendString(&dst, text);
line->Received = DateTime_CurrentUTC_MS();
}
void Chat_LogError(ReturnCode result, const char* place) {
Chat_Add4("&cError %h when %c", &result, place, NULL, NULL);
}
View
@@ -4,7 +4,7 @@
#include "ExtMath.h"
#include "Funcs.h"
#include "Game.h"
#include "GraphicsAPI.h"
#include "Graphics.h"
#include "Entity.h"
#include "MapRenderer.h"
#include "Platform.h"
View
@@ -241,7 +241,7 @@
<ClInclude Include="Funcs.h" />
<ClInclude Include="Game.h" />
<ClInclude Include="ExtMath.h" />
<ClInclude Include="GraphicsAPI.h" />
<ClInclude Include="Graphics.h" />
<ClInclude Include="GraphicsCommon.h" />
<ClInclude Include="Platform.h" />
<ClInclude Include="String.h" />
@@ -262,7 +262,6 @@
<ClCompile Include="Builder.c" />
<ClCompile Include="Chat.c" />
<ClCompile Include="ChunkUpdater.c" />
<ClCompile Include="D3D9Api.c" />
<ClCompile Include="Bitmap.c" />
<ClCompile Include="DisplayDevice.c" />
<ClCompile Include="Drawer.c" />
@@ -273,6 +272,7 @@
<ClCompile Include="ExtMath.c" />
<ClCompile Include="Formats.c" />
<ClCompile Include="Game.c" />
<ClCompile Include="Graphics.c" />
<ClCompile Include="Gui.c" />
<ClCompile Include="HeldBlockRenderer.c" />
<ClCompile Include="InputHandler.c" />
@@ -290,7 +290,6 @@
<ClCompile Include="Entity.c" />
<ClCompile Include="MapRenderer.c" />
<ClCompile Include="ModelCache.c" />
<ClCompile Include="OpenGLApi.c" />
<ClCompile Include="Options.c" />
<ClCompile Include="PackedCol.c" />
<ClCompile Include="GraphicsCommon.c" />
@@ -141,9 +141,6 @@
<ClInclude Include="ExtMath.h">
<Filter>Header Files\Math</Filter>
</ClInclude>
<ClInclude Include="GraphicsAPI.h">
<Filter>Header Files\Graphics</Filter>
</ClInclude>
<ClInclude Include="GraphicsCommon.h">
<Filter>Header Files\Graphics</Filter>
</ClInclude>
@@ -315,6 +312,9 @@
<ClInclude Include="BlockPhysics.h">
<Filter>Header Files\Blocks</Filter>
</ClInclude>
<ClInclude Include="Graphics.h">
<Filter>Header Files\Graphics</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="String.c">
@@ -338,9 +338,6 @@
<ClCompile Include="World.c">
<Filter>Source Files\Map</Filter>
</ClCompile>
<ClCompile Include="D3D9Api.c">
<Filter>Source Files\Graphics</Filter>
</ClCompile>
<ClCompile Include="PackedCol.c">
<Filter>Source Files\2D\Utils</Filter>
</ClCompile>
@@ -395,9 +392,6 @@
<ClCompile Include="Deflate.c">
<Filter>Source Files\IO</Filter>
</ClCompile>
<ClCompile Include="OpenGLApi.c">
<Filter>Source Files\Graphics</Filter>
</ClCompile>
<ClCompile Include="Formats.c">
<Filter>Source Files\Map</Filter>
</ClCompile>
@@ -578,5 +572,8 @@
<ClCompile Include="_ftcache.c">
<Filter>Source Files\Freetype</Filter>
</ClCompile>
<ClCompile Include="Graphics.c">
<Filter>Source Files\Graphics</Filter>
</ClCompile>
</ItemGroup>
</Project>
Oops, something went wrong.

0 comments on commit 8782d25

Please sign in to comment.