Skip to content

Commit

Permalink
xrRenderPC_GL: now can build (not linking) on linux
Browse files Browse the repository at this point in the history
  • Loading branch information
@eagleivg @q4a
eagleivg authored and q4a committed Sep 29, 2018
1 parent 49fd484 commit 580e0dc
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 26 deletions.
9 changes: 9 additions & 0 deletions src/Common/PlatformLinux.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -931,5 +931,14 @@ typedef struct _D3DRECT {

typedef DWORD FOURCC;

typedef struct _AVIINDEXENTRY {
DWORD ckid;
DWORD dwFlags;
DWORD dwChunkOffset;
DWORD dwChunkLength;
} AVIINDEXENTRY;

typedef void *HIC;

inline BOOL SwitchToThread() { return (0 == pthread_yield()); }

14 changes: 7 additions & 7 deletions src/Layers/xrRender/xrRender_console.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,9 @@ class CCC_detail_radius : public CCC_Integer
apply();
}

void Status(TStatus& S) override
void getStatus(TStatus& S) override
{
CCC_Integer::Status(S);
CCC_Integer::getStatus(S);
}
};

Expand Down Expand Up @@ -285,9 +285,9 @@ class CCC_tf_Aniso : public CCC_Integer
CCC_Integer::Execute(args);
apply();
}
virtual void Status(TStatus& S)
virtual void getStatus(TStatus& S)
{
CCC_Integer::Status(S);
CCC_Integer::getStatus(S);
apply();
}
};
Expand Down Expand Up @@ -315,9 +315,9 @@ class CCC_tf_MipBias : public CCC_Float
CCC_Float::Execute(args);
apply();
}
virtual void Status(TStatus& S)
virtual void getStatus(TStatus& S)
{
CCC_Float::Status(S);
CCC_Float::getStatus(S);
apply();
}
};
Expand Down Expand Up @@ -639,7 +639,7 @@ class CCC_Dof : public CCC_Vector3
g_pGamePersistent->SetBaseDof(ps_r2_dof);
}
}
virtual void Status(TStatus& S) { xr_sprintf(S, "%f,%f,%f", value->x, value->y, value->z); }
virtual void getStatus(TStatus& S) { xr_sprintf(S, "%f,%f,%f", value->x, value->y, value->z); }
virtual void Info(TInfo& I)
{
xr_sprintf(I, "vector3 in range [%f,%f,%f]-[%f,%f,%f]", min.x, min.y, min.z, max.x, max.y, max.z);
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_GL/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ add_definitions(-DXRLCUTIL_EXPORTS -D_USRDLL -DXRRENDER_GL_EXPORTS -DUSE_OGL -DN
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})

set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
target_link_libraries(${PROJECT_NAME} xrCore luabind LuaJIT xrCDB xrEngine xrParticles xrScriptEngine xrAPI)
target_link_libraries(${PROJECT_NAME} xrCore luabind luajit xrCDB xrEngine xrParticles xrScriptEngine xrAPI)
12 changes: 6 additions & 6 deletions src/xrEngine/XR_IOConsole.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,14 +446,14 @@ void CConsole::DrawBackgrounds(bool bGame)
continue;
}

r2.set_zero();
r2.set_zero();
tmp.assign(ts.text.c_str(), ts.HL_start);
r2.x1 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());
r2.y1 = pr.y1 + i * font_h;
r2.x1 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());
r2.y1 = pr.y1 + i * font_h;

tmp.assign(ts.text.c_str(), ts.HL_finish);
r2.x2 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());
r2.y2 = r2.y1 + font_h;
r2.x2 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());
r2.y2 = r2.y1 + font_h;

DrawRect(r2, tips_word_color);

Expand Down Expand Up @@ -564,7 +564,7 @@ void CConsole::ExecuteCommand(LPCSTR cmd_str, bool record_cmd)
else
{
IConsole_Command::TStatus stat;
cc->Status(stat);
cc->getStatus(stat);
Msg("- %s %s", cc->Name(), stat);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/XR_IOConsole_get.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ LPCSTR CConsole::GetString(LPCSTR cmd) const
return NULL;

static IConsole_Command::TStatus stat;
cc->Status(stat);
cc->getStatus(stat);
return stat;
}

Expand Down
2 changes: 2 additions & 0 deletions src/xrEngine/tntQAVI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#if defined(WINDOWS)
#include "vfw.h"
#include "mmsystem.h"
#elif defined(LINUX)
#include <FreeImage.h>
#endif

// replaced with standard AVIIF_KEYFRAME
Expand Down
4 changes: 2 additions & 2 deletions src/xrEngine/xr_ioc_cmd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class CCC_Help : public IConsole_Command
{
IConsole_Command& C = *(it->second);
TStatus _S;
C.Status(_S);
C.getStatus(_S);
TInfo _I;
C.Info(_I);

Expand Down Expand Up @@ -601,7 +601,7 @@ class CCC_soundDevice : public CCC_Token
GetToken();
if (!tokens)
return;
inherited::Status(S);
inherited::getStatus(S);
}

const xr_token* GetToken() noexcept override
Expand Down
18 changes: 9 additions & 9 deletions src/xrEngine/xr_ioc_cmd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ class ENGINE_API IConsole_Command
LPCSTR Name() { return cName; }
void InvalidSyntax();
virtual void Execute(LPCSTR args) = 0;
virtual void Status(TStatus& S) { S[0] = 0; }
virtual void getStatus(TStatus& S) { S[0] = 0; }
virtual void Info(TInfo& I) { xr_strcpy(I, "(no arguments)"); }
virtual void Save(IWriter* F)
{
TStatus S;
Status(S);
getStatus(S);
if (S[0])
F->w_printf("%s %s\r\n", cName, S);
}
Expand Down Expand Up @@ -110,7 +110,7 @@ class ENGINE_API CCC_Mask : public IConsole_Command
else
InvalidSyntax();
}
virtual void Status(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); }
virtual void getStatus(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); }
virtual void Info(TInfo& I) { xr_strcpy(I, "'on/off' or '1/0'"); }
virtual void fill_tips(vecTips& tips, u32 /*mode*/)
{
Expand All @@ -136,7 +136,7 @@ class ENGINE_API CCC_ToggleMask : public IConsole_Command
strconcat(sizeof(S), S, cName, " is ", value->test(mask) ? "on" : "off");
Log(S);
}
virtual void Status(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); }
virtual void getStatus(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); }
virtual void Info(TInfo& I) { xr_strcpy(I, "'on/off' or '1/0'"); }
virtual void fill_tips(vecTips& tips, u32 /*mode*/)
{
Expand Down Expand Up @@ -175,7 +175,7 @@ class ENGINE_API CCC_Token : public IConsole_Command
if (!tok->name)
InvalidSyntax();
}
virtual void Status(TStatus& S)
virtual void getStatus(TStatus& S)
{
const xr_token* tok = GetToken();
while (tok->name)
Expand Down Expand Up @@ -255,7 +255,7 @@ class ENGINE_API CCC_Float : public IConsole_Command
else
*value = v;
}
virtual void Status(TStatus& S)
virtual void getStatus(TStatus& S)
{
xr_sprintf(S, sizeof(S), "%3.5f", *value);
while (xr_strlen(S) && ('0' == S[xr_strlen(S) - 1]))
Expand Down Expand Up @@ -305,7 +305,7 @@ class ENGINE_API CCC_Vector3 : public IConsole_Command
}
value->set(v);
}
virtual void Status(TStatus& S) { xr_sprintf(S, sizeof(S), "(%f, %f, %f)", value->x, value->y, value->z); }
virtual void getStatus(TStatus& S) { xr_sprintf(S, sizeof(S), "(%f, %f, %f)", value->x, value->y, value->z); }
virtual void Info(TInfo& I)
{
xr_sprintf(I, sizeof(I), "vector3 in range [%e,%e,%e]-[%e,%e,%e]", min.x, min.y, min.z, max.x, max.y, max.z);
Expand Down Expand Up @@ -344,7 +344,7 @@ class ENGINE_API CCC_Integer : public IConsole_Command
else
*value = v;
}
virtual void Status(TStatus& S) { xr_itoa(*value, S, 10); }
virtual void getStatus(TStatus& S) { xr_itoa(*value, S, 10); }
virtual void Info(TInfo& I) { xr_sprintf(I, sizeof(I), "integer value in range [%d,%d]", min, max); }
virtual void fill_tips(vecTips& tips, u32 mode)
{
Expand All @@ -370,7 +370,7 @@ class ENGINE_API CCC_String : public IConsole_Command
};

virtual void Execute(LPCSTR args) { strncpy_s(value, size, args, size - 1); }
virtual void Status(TStatus& S) { xr_strcpy(S, value); }
virtual void getStatus(TStatus& S) { xr_strcpy(S, value); }
virtual void Info(TInfo& I) { xr_sprintf(I, sizeof(I), "string with up to %d characters", size); }
virtual void fill_tips(vecTips& tips, u32 mode)
{
Expand Down

0 comments on commit 580e0dc

Please sign in to comment.