amacocian/gMod
1
0
Fork 0
mirror of https://github.com/gwdevhub/gMod.git synced 2026-07-22 02:19:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes:

Browse Source 
* The hash of textures is now computed the first time they are used. The hash is recomputed if the content might have changed.
* In some games, textures are used as rendering targets (e.g. a mirror or a portal in Portal). The hash calculation of these textures might slow down the game.
-> there is an option to disable the computation of hashes for rendering targets.
* Enable or Disable the support of tpf mods affect now the game immediately.
* Little rearrangements in the GUI.
* uMod can now extract the content of mods to disk and the game loads the textures from there. This solves the huge memory problem of uMod.
This commit is contained in:
code@koerner-de.net
2013-01-07 07:43:38 +00:00
parent 2593729634
commit 601c8c1504
34 changed files with 1523 additions and 1237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uMod_GUI/uMod_Sender.cpp
+28 -14
View File
@@ -101,17 +101,11 @@ int uMod_Sender::Send( const uMod_GameInfo &game, const uMod_GameInfo &game_old,
SendBool( game.GetSaveAllTextures(), CONTROL_SAVE_ALL);
SendBool(game.SupportTPF(), CONTROL_SUPPORT_TPF);
SendBool(game.ComputeRenderTargets(), CONTROL_COMPUTE_RENDER_TARGETS);
SendPath(game.GetSavePath());
/*
wxString path;
path = game.GetSavePath();
if (path!=game_old.GetSavePath()) SendPath(path);
*/
if ( OldTextures== (uMod_TextureElement_SortedArrayPtr*)0) OldTextures = new uMod_TextureElement_SortedArrayPtr( Compare_uMod_TextureElement );
if ( OldTextures == (uMod_TextureElement_SortedArrayPtr*)0) OldTextures = new uMod_TextureElement_SortedArrayPtr( Compare_uMod_TextureElement );
//uMod_TextureElement_SortedArrayPtr* current_textures = new uMod_TextureElement_SortedArrayPtr( Compare_uMod_TextureElement );
@@ -162,6 +156,7 @@ int uMod_Sender::SendTextures(const uMod_TextureElement_SortedArrayPtr &old_tex,
MsgStruct *msg;
int buffer_pos = 0;
// both arrays are sorted
// we go through both arrays in parallel
while (old_pos<old_tex.GetCount() && new_pos<new_tex.GetCount())
@@ -222,7 +217,18 @@ int uMod_Sender::SendTextures(const uMod_TextureElement_SortedArrayPtr &old_tex,
int uMod_Sender::AddTexture( uMod_TextureElement *tex, int &buffer_pos)
{
MsgStruct *msg;
bool send_data = true;
unsigned int size = tex->Content().Len();
if (size==0)
{
send_data = false;
size = tex->ExtractedFile().Len();
if (size==0) return 0;
size++;
size*=sizeof(wchar_t);
}
if ((sizeof(MsgStruct) + buffer_pos) >=BIG_BUFSIZE) //the buffer is full
{
if (int ret = SendToGame( Buffer, buffer_pos)) return ret;
@@ -232,12 +238,22 @@ int uMod_Sender::AddTexture( uMod_TextureElement *tex, int &buffer_pos)
msg = (MsgStruct*) &Buffer[buffer_pos];
msg->Hash = tex->Hash();
msg->Value = size;
msg->Control = CONTROL_FORCE_RELOAD_TEXTURE_DATA;
if (send_data)
msg->Control = CONTROL_FORCE_RELOAD_TEXTURE_DATA;
else
msg->Control = CONTROL_FORCE_RELOAD_TEXTURE;
buffer_pos += sizeof(MsgStruct);
const char* temp = tex->Content().Data();
const char* temp = NULL;
if (send_data)
temp = tex->Content().Data();
else
temp = (const char*) tex->ExtractedFile().wc_str();
if (temp!=(char*)0)
{
unsigned int l = 0u;
@@ -252,8 +268,7 @@ int uMod_Sender::AddTexture( uMod_TextureElement *tex, int &buffer_pos)
}
}
if (LastError.Len()>0) return 1;
else return 0;
return 0;
}
int uMod_Sender::RemoveTexture( uMod_TextureElement *tex, int &buffer_pos)
@@ -272,8 +287,7 @@ int uMod_Sender::RemoveTexture( uMod_TextureElement *tex, int &buffer_pos)
buffer_pos += sizeof(MsgStruct);
if (LastError.Len()>0) return 1;
else return 0;
return 0;
}
int uMod_Sender::SendKey(int key, int ctr)