summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4b95088)
raw | patch | inline | side by side (parent: 4b95088)
author | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
Fri, 18 Aug 2017 19:18:28 +0000 (22:18 +0300) | ||
committer | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
Fri, 18 Aug 2017 19:18:36 +0000 (22:18 +0300) |
src/game/g_game.pas | patch | blob | history | |
src/game/g_map.pas | patch | blob | history |
diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index e69bde9bdc4ce3537c932b585560bb4daf7c1b2a..1b649f869437becf0ca270444a1353a2d399e066 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
begin
case getBool(1) of
-1: begin end;
- 0: gdbg_map_use_grid_render := false;
- 1: gdbg_map_use_grid_render := true;
+ 0: gdbg_map_use_accel_render := false;
+ 1: gdbg_map_use_accel_render := true;
end;
- if gdbg_map_use_grid_render then g_Console_Add('accelerated rendering: tan') else g_Console_Add('accelerated rendering: ona');
+ if gdbg_map_use_accel_render then g_Console_Add('accelerated rendering: tan') else g_Console_Add('accelerated rendering: ona');
exit;
end;
begin
case getBool(1) of
-1: begin end;
- 0: gdbg_map_use_grid_coldet := false;
- 1: gdbg_map_use_grid_coldet := true;
+ 0: gdbg_map_use_accel_coldet := false;
+ 1: gdbg_map_use_accel_coldet := true;
end;
- if gdbg_map_use_grid_coldet then g_Console_Add('accelerated coldet: tan') else g_Console_Add('accelerated coldet: ona');
+ if gdbg_map_use_accel_coldet then g_Console_Add('accelerated coldet: tan') else g_Console_Add('accelerated coldet: ona');
exit;
end;
diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 0e5dd09d1dcb1aaf2d6fd22528ae542a0c446200..b5e457cdc197ecdde00cc5731d2090aaa2968e96 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
BackID: DWORD = DWORD(-1);
gExternalResources: TStringList;
- gdbg_map_use_grid_render: Boolean = true;
- gdbg_map_use_grid_coldet: Boolean = true;
+ gdbg_map_use_accel_render: Boolean = true;
+ gdbg_map_use_accel_coldet: Boolean = true;
gdbg_map_use_tree_draw: Boolean = false;
gdbg_map_use_tree_coldet: Boolean = false;
gdbg_map_dump_coldet_tree_queries: Boolean = false;
dplClear();
ptag := panelTypeToTag(PanelType);
- if gdbg_map_use_grid_render then
+ if gdbg_map_use_accel_render then
begin
if gdbg_map_use_tree_draw then
begin
//TODO: detailed profile
if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('wall coldet');
try
- if gdbg_map_use_grid_coldet then
+ if gdbg_map_use_accel_coldet then
begin
if gdbg_map_use_tree_coldet then
begin
end;
end;
-{var
- cctype1: Integer = 3; // priority: 0: water, 1: acid1, 2: acid2; 3: others (nothing)
- texid1: DWORD;}
begin
//TODO: detailed profile?
if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquid coldet');
try
- if gdbg_map_use_grid_coldet then
+ if gdbg_map_use_accel_coldet then
begin
texid := TEXTURE_NONE;
if gdbg_map_use_tree_coldet then
begin
mapTree.aabbQuery(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
- {
- cctype1 := cctype;
- texid1 := texid;
- cctype := 3;
- texid := TEXTURE_NONE;
- gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
- if (cctype1 <> cctype) or (texid1 <> texid) then
- begin
- e_WriteLog(Format('g_Map_CollideLiquid_Texture(%d, %d, %u, %u): tree(cctype:%d;texid:%u); grid(cctype:%d;texid:%u)', [X, Y, Width, Height, cctype1, texid1, cctype, texid]), MSG_WARNING);
- end;}
end
else
begin