eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 00:09:18 +02:00
Code Issues 123 Wiki Activity

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2018-10-14 22:29:39 +02:00
parent daa3146cd8 87d95b2d10
commit b86fcbdbbc
5 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Button.cpp
View File

@@ -71,7 +71,7 @@ void TButton::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *pMod
if( ( pModelOn == nullptr ) if( ( pModelOn == nullptr )
&& ( pModelOff == nullptr ) ) { && ( pModelOff == nullptr ) ) {
// if we failed to locate even one state submodel, cry // if we failed to locate even one state submodel, cry
ErrorLog( "Bad model: failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + pModel1->NameGet() + "\"", logtype::model ); ErrorLog( "Bad model: failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + ( pModel1 != nullptr ? pModel1->NameGet() : pModel2 != nullptr ? pModel2->NameGet() : "NULL" ) + "\"", logtype::model );
} }
// pass submodel location to defined sounds // pass submodel location to defined sounds

41
PyInt.cpp
View File

@@ -44,14 +44,20 @@ void render_task::run() {
glFlush(); glFlush();
} }
Py_DECREF( outputheight ); if( outputheight != nullptr ) { Py_DECREF( outputheight ); }
Py_DECREF( outputwidth ); if( outputwidth != nullptr ) { Py_DECREF( outputwidth ); }
Py_DECREF( output ); Py_DECREF( output );
} }
// clean up after yourself // clean up after yourself
delete this; delete this;
} }
void render_task::cancel() {
Py_DECREF( m_input );
delete this;
}
// initializes the module. returns true on success // initializes the module. returns true on success
auto python_taskqueue::init() -> bool { auto python_taskqueue::init() -> bool {
@@ -142,7 +148,7 @@ void python_taskqueue::exit() {
// get rid of the leftover tasks // get rid of the leftover tasks
// with the workers dead we don't have to worry about concurrent access anymore // with the workers dead we don't have to worry about concurrent access anymore
for( auto *task : m_tasks.data ) { for( auto *task : m_tasks.data ) {
delete task; task->cancel();
} }
// take a bow // take a bow
PyEval_AcquireLock(); PyEval_AcquireLock();
@@ -159,22 +165,29 @@ auto python_taskqueue::insert( task_request const &Task ) -> bool {
auto *renderer { fetch_renderer( Task.renderer ) }; auto *renderer { fetch_renderer( Task.renderer ) };
if( renderer == nullptr ) { return false; } if( renderer == nullptr ) { return false; }
// acquire a lock on the task queue and add a new task
auto *newtask { new render_task( renderer, Task.input, Task.target ) };
bool newtaskinserted { false };
// acquire a lock on the task queue and add the new task
{ {
std::lock_guard<std::mutex> lock( m_tasks.mutex ); std::lock_guard<std::mutex> lock( m_tasks.mutex );
// check the task list for a pending request with the same target
// if task for this target already exists, don't add another for( auto &task : m_tasks.data ) {
for (render_task *task : m_tasks.data) if( task->target() == Task.target ) {
if (task->get_target() == Task.target) // replace pending task in the slot with the more recent one
{
PyEval_AcquireLock(); PyEval_AcquireLock();
Py_DECREF(Task.input); {
task->cancel();
}
PyEval_ReleaseLock(); PyEval_ReleaseLock();
task = newtask;
return false; newtaskinserted = true;
break;
} }
}
m_tasks.data.emplace_back( new render_task( renderer, Task.input, Task.target ) ); if( false == newtaskinserted ) {
m_tasks.data.emplace_back( newtask );
}
} }
// potentially wake a worker to handle the new task // potentially wake a worker to handle the new task
m_condition.notify_one(); m_condition.notify_one();

3
PyInt.h
View File

@@ -44,7 +44,8 @@ public:
{} {}
// methods // methods
void run(); void run();
const texture_handle get_target() const { return m_target; } void cancel();
auto target() const -> texture_handle { return m_target; }
private: private:
// members // members

2
Track.cpp
View File

@@ -1745,7 +1745,7 @@ int TTrack::CrossSegment(int from, int into)
void TTrack::RaAnimListAdd(TTrack *t) void TTrack::RaAnimListAdd(TTrack *t)
{ // dodanie toru do listy animacyjnej { // dodanie toru do listy animacyjnej
if (SwitchExtension) if ((t != nullptr) && (SwitchExtension != nullptr))
{ {
if (t == this) if (t == this)
return; // siebie nie dodajemy drugi raz do listy return; // siebie nie dodajemy drugi raz do listy

2
version.h
View File

@@ -1 +1 @@
#define VERSION_INFO "M7 (GL3) 14.10.2018, based on milek-8a8d92ef, tmj-68f82be4" #define VERSION_INFO "M7 (GL3) 14.10.2018, based on milek-87d95b2d, tmj-81c9238"