Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dynamic loading humbuggery.

Browse Source
This commit is contained in:
jaynus 2015-05-10 22:05:25 -07:00
parent 0511f2f8f1
commit 1355662bfc
14 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ace_dynload.dll
View File

Binary file not shown.

BIN
ace_vd.dll
View File

Binary file not shown.

4
addons/vehicledamage/XEH_postInit.sqf
View File

@ -3,4 +3,6 @@
// Handle damage to local vehicles
[QGVAR(hp), FUNC(dispatchHitPart)] call EFUNC(common,addEventHandler);
[FUNC(monitorResultsPFH), 0, []] call CBA_fnc_addPerFrameHandler;
[FUNC(monitorResultsPFH), 0, []] call CBA_fnc_addPerFrameHandler;
[QGVAR(setAnimationNames), FUNC(setAnimationNames)] call EFUNC(common,addEventHandler);

2
addons/vehicledamage/functions/fnc_initializeExtension.sqf
View File

@ -18,7 +18,7 @@ if(GVAR(async)) then {
diag_log text format["[ACE] - Vehicle damage extension caching..."];
"init:" call FUNC(callExtension);
#ifdef ACE_VEHICLEDAMAGE_RENDER_DEBUG
#ifdef DEBUG_VEHICLEDAMAGE_RENDER
"debug_render:" call FUNC(callExtension);
diag_log text format["[ACE] - DEBUG - DirectX11 Debug Rendering initialized"];
#endif

3
addons/vehicledamage/functions/fnc_setAnimationNames.sqf Normal file
View File

@ -0,0 +1,3 @@
#include "script_component.hpp"
diag_log text format["ENTEERED!!!! %1", _this];

3
addons/vehicledamage/script_component.hpp
View File

@ -15,4 +15,5 @@
#define VECTOR_TEXT(x) ([(x)] call FUNC(_textVector))
#define RELATIVE_VECTOR_TEXT(o,x) ([(o worldToModelVisual ((x) call EFUNC(common,ASLToPosition)))] call FUNC(_textVector))
#define DEBUG_EXTENSION_DYNLOAD
#define DEBUG_EXTENSION_DYNLOAD
#define DEBUG_VEHICLEDAMAGE_RENDER

22
extensions/common/dispatch.hpp
View File

@ -55,7 +55,7 @@ namespace ace {
class threaded_dispatcher : public dispatcher {
public:
threaded_dispatcher() : _worker(&ace::threaded_dispatcher::monitor, this) {
threaded_dispatcher() : _stop(false), _worker(&ace::threaded_dispatcher::monitor, this) {
}
~threaded_dispatcher() {}
@ -99,11 +99,14 @@ namespace ace {
void push_result(const std::string & result) {
push_result(dispatch_result(result, -1));
}
void stop() {
std::lock_guard<std::mutex> lock(_messages_lock);
_stop = true;
}
protected:
void monitor() {
_ready = false;
while (true) {
while (!_stop) {
{
std::lock_guard<std::mutex> lock(_messages_lock);
while (!_messages.empty()) {
@ -135,15 +138,16 @@ namespace ace {
sleep(5);
}
}
std::queue<dispatch_result> _results;
std::mutex _results_lock;
std::atomic_bool _stop;
std::queue<dispatch_result> _results;
std::mutex _results_lock;
std::queue<dispatch_message> _messages;
std::mutex _messages_lock;
std::queue<dispatch_message> _messages;
std::mutex _messages_lock;
std::thread _worker;
std::thread _worker;
uint64_t _message_id;
uint64_t _message_id;
};
class threaded_dispatch : public threaded_dispatcher, public singleton<dispatch> { };
};

2
extensions/common/pbo/search.cpp
View File

@ -135,6 +135,8 @@ namespace ace {
pbo_stream.close();
}
LOG(INFO) << "PBO Index complete";
return true;
}

24
extensions/dynload/dynloader.hpp
View File

@ -11,11 +11,11 @@ namespace ace {
class module {
public:
module() : handle(nullptr), function(nullptr), name("") {}
module(const std::string & name_, HANDLE handle_, RVExtension function_, const std::string & file_) : handle(nullptr), function(function_), name(name_), temp_filename(file_) {}
module(const std::string & name_, HMODULE handle_, RVExtension function_, const std::string & file_) : handle(handle_), function(function_), name(name_), temp_filename(file_) {}
std::string name;
std::string temp_filename;
HINSTANCE handle;
HMODULE handle;
RVExtension function;
};
@ -32,7 +32,7 @@ namespace ace {
#ifdef _WINDOWS
bool load(const arguments & args_, std::string & result) {
HINSTANCE dllHandle;
HMODULE dllHandle;
RVExtension function;
LOG(INFO) << "Load requested [" << args_.as_string(0) << "]";
@ -55,9 +55,9 @@ namespace ace {
return false;
}
std::string temp_filename = buffer;
if (!CopyFileA(args_.as_string(0).c_str(), temp_filename.c_str(), TRUE)) {
if (!CopyFileA(args_.as_string(0).c_str(), temp_filename.c_str(), FALSE)) {
DeleteFile(temp_filename.c_str());
if (!CopyFileA(args_.as_string(0).c_str(), temp_filename.c_str(), TRUE)) {
if (!CopyFileA(args_.as_string(0).c_str(), temp_filename.c_str(), FALSE)) {
LOG(ERROR) << "CopyFile() , e=" << GetLastError();
return false;
}
@ -89,17 +89,25 @@ namespace ace {
LOG(INFO) << "Unload requested [" << args_.as_string(0) << "]";
if (_modules.find(args_.as_string(0)) != _modules.end()) {
if (_modules.find(args_.as_string(0)) == _modules.end()) {
LOG(INFO) << "Unload failed, module not loaded [" << args_.as_string(0) << "]";
return true;
}
FreeLibrary(_modules[args_.as_string(0)].handle);
if (!FreeLibrary(_modules[args_.as_string(0)].handle)) {
LOG(INFO) << "FreeLibrary() failed during unload, e=" << GetLastError();
return false;
}
//if (!DeleteFileA(_modules[args_.as_string(0)].temp_filename.c_str())) {
// LOG(INFO) << "DeleteFile() failed during unload, e=" << GetLastError();
// return false;
//}
_modules.erase(args_.as_string(0));
LOG(INFO) << "Unload complete [" << args_.as_string(0) << "]";
return false;
return true;
}
#endif

3
extensions/tests/test.pbo.txt Normal file
View File

@ -0,0 +1,3 @@
init:
debug_render:
register_vehicle:\test\test.p3d,2,4050.18;3802.55;5.075

6
extensions/vd/ace_vd_dllmain.cpp
View File

@ -1,6 +1,6 @@
#include "shared.hpp"
#include "logging.hpp"
#include "controller.hpp"
INITIALIZE_EASYLOGGINGPP
BOOLEAN WINAPI DllMain(IN HINSTANCE hDllHandle,
@ -25,6 +25,10 @@ BOOLEAN WINAPI DllMain(IN HINSTANCE hDllHandle,
break;
case DLL_PROCESS_DETACH:
if (Reserved == NULL) {
ace::vehicledamage::controller::get().stop();
LOG(INFO) << "Vehicle Damage unloaded and halted";
}
break;
}

6
extensions/vd/base_vehicle.cpp
View File

@ -28,9 +28,9 @@ namespace ace {
// P3d store in x,z,y format
for (auto & face : object_->lods[fire_lod]->faces) {
bt_mesh->addTriangle(
btVector3(face->vertices[0]->x(), face->vertices[0]->z(), face->vertices[0]->y()),
btVector3(face->vertices[1]->x(), face->vertices[1]->z(), face->vertices[1]->y()),
btVector3(face->vertices[2]->x(), face->vertices[2]->z(), face->vertices[2]->y())
btVector3(face->vertices[0]->x(), face->vertices[0]->y(), face->vertices[0]->z()),
btVector3(face->vertices[1]->x(), face->vertices[1]->y(), face->vertices[1]->z()),
btVector3(face->vertices[2]->x(), face->vertices[2]->y(), face->vertices[2]->z())
);
}

8
extensions/vd/controller.cpp
View File

@ -111,8 +111,14 @@ namespace ace {
vehicle_p _vehicle = std::make_shared<vehicle>(static_cast<uint32_t>(_args[1]), _object, _args[2]);
vehicles[static_cast<uint32_t>(_args[1])] = _vehicle;
LOG(INFO) << "vehicle registered: [id=" << _args[1].as_uint32() << ", type=" << _args[0].as_string() << "]";
// For results on a valid vehicle registration, we return its animation names for that given vehicle
std::stringstream _animationNames;
for (auto & anim : _vehicle->object->animations) {
_animationNames << anim->name << ",";
}
this->push_result("setAnimationNames:"+_animationNames.str());
LOG(INFO) << "vehicle registered: [id=" << _args[1].as_uint32() << ", type=" << _args[0].as_string() << "]";
DEBUG_DISPATCH("register_vehicle", _args[1].as_string());
return true;

5
extensions/vd/debug/penetration_display.cpp
View File

@ -44,13 +44,13 @@ namespace ace {
_BatchEffect.reset(new BasicEffect(_pd3dDevice));
_BatchEffect->SetVertexColorEnabled(true);
{
void const* shaderByteCode;
size_t byteCodeLength;
_BatchEffect->GetVertexShaderBytecode(&shaderByteCode, &byteCodeLength);
hr = _pd3dDevice->CreateInputLayout(VertexPositionColor::InputElements,
VertexPositionColor::InputElementCount,
shaderByteCode, byteCodeLength,
@ -162,7 +162,6 @@ namespace ace {
vertices[1] = { face->vertices[1]->x(), face->vertices[1]->y(), face->vertices[1]->z() };
vertices[2] = { face->vertices[2]->x(), face->vertices[2]->y(), face->vertices[2]->z() };
XMVECTORF32 v[3] = {
{ vertices[0].x(), vertices[0].y(), vertices[0].z() },
{ vertices[1].x(), vertices[1].y(), vertices[1].z() },