LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed crash

Browse source
This commit is contained in:
Mikulas Florek 2018-10-26 22:38:32 +02:00
parent 2281a7eaf3
commit 4c740e320b
2 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
data/imgui.ini
View file

@ -1,7 +1,8 @@
[Window][Settings]
Pos=347,43
Size=1149,500
Pos=344,43
Size=1154,623
Collapsed=0
DockId=0x00000008,1
[Window][Debug##Default]
Pos=887,889
@ -9,34 +10,40 @@ Size=400,400
Collapsed=0
[Window][Assets]
Pos=347,547
Size=1503,503
Pos=344,668
Size=1506,382
Collapsed=0
DockId=0x00000003,0
[Window][Asset properties]
Pos=1500,43
Size=350,500
Size=350,623
Collapsed=0
DockId=0x00000009,0
[Window][Log]
Pos=1,547
Size=342,503
Pos=1,548
Size=341,502
Collapsed=0
DockId=0x00000006,0
[Window][Properties]
Pos=1,43
Size=342,500
Size=341,503
Collapsed=0
DockId=0x00000007,0
[Window][Entity List]
Pos=1,547
Size=342,503
Pos=1,548
Size=341,502
Collapsed=0
DockId=0x00000006,1
[Window][###Scene View]
Pos=347,43
Size=1149,500
Pos=344,43
Size=1154,623
Collapsed=0
DockId=0x00000008,0
[Window][###game_view]
Pos=347,43
@ -72,7 +79,15 @@ Collapsed=0
DockId=0x00000001,3
[Docking][Data]
DockSpace ID=0x00000001 Pos=1,43 Size=1849,1007 CentralNode=1 SelectedTab=0x1C33C293
DockSpace ID=0x39930E19 Pos=0,0 Size=0,0 CentralNode=1
DockSpace ID=0xAFF71519 Pos=1,43 Size=1599,976 CentralNode=1
DockSpace ID=0x00000001 Pos=1,43 Size=1849,1007 CentralNode=1 SelectedTab=0x1C33C293
DockSpace ID=0x39930E19 Pos=0,0 Size=0,0 CentralNode=1
DockSpace ID=0xAFF71519 Pos=1,43 Size=1849,1007 Split=X SelectedTab=0x1C33C293
DockNode ID=0x00000004 Parent=0xAFF71519 SizeRef=341,1007 Split=Y SelectedTab=0xC89E3217
DockNode ID=0x00000007 Parent=0x00000004 SizeRef=341,503 SelectedTab=0xC89E3217
DockNode ID=0x00000006 Parent=0x00000004 SizeRef=341,502 SelectedTab=0x512816C4
DockNode ID=0x00000005 Parent=0xAFF71519 SizeRef=1506,1007 Split=Y
DockNode ID=0x00000002 Parent=0x00000005 SizeRef=1849,623 Split=X SelectedTab=0x1C33C293
DockNode ID=0x00000008 Parent=0x00000002 SizeRef=1154,503 CentralNode=1 SelectedTab=0xE32DF26B
DockNode ID=0x00000009 Parent=0x00000002 SizeRef=350,503 SelectedTab=0x3BC70FD5
DockNode ID=0x00000003 Parent=0x00000005 SizeRef=1849,382 SelectedTab=0x7E7D78B8

4
src/renderer/editor/plugins.cpp
View file

@ -859,6 +859,7 @@ struct ModelPlugin final : AssetBrowser::IPlugin, AssetCompiler::IPlugin
if (m_tile.frame_countdown >= 0) {
--m_tile.frame_countdown;
if (m_tile.frame_countdown == -1) {
m_tile.universe->destroyEntity((EntityRef)m_tile.mesh_entity);
StaticString<MAX_PATH_LENGTH> path(".lumix/asset_tiles/", m_tile.path_hash, ".dds");
saveAsDDS(path, &m_tile.data[0], AssetBrowser::TILE_SIZE, AssetBrowser::TILE_SIZE);
Engine& engine = m_app.getWorldEditor().getEngine();
@ -1025,7 +1026,7 @@ bgfx::TextureFormat::RGBA8, BGFX_TEXTURE_READ_BACK); renderer->viewCounterAdd();
cmd->mem.size = m_tile.data.size() * sizeof(&m_tile.data[0]);
cmd->mem.own = false;
renderer->push(cmd);
m_tile.universe->destroyEntity(mesh_entity);
m_tile.mesh_entity = mesh_entity;
m_tile.frame_countdown = 2;
m_tile.path_hash = model->getPath().getHash();
model->getResourceManager().unload(*model);
@ -1062,6 +1063,7 @@ bgfx::TextureFormat::RGBA8, BGFX_TEXTURE_READ_BACK); renderer->viewCounterAdd();
}
Universe* universe = nullptr;
EntityPtr mesh_entity = INVALID_ENTITY;
Pipeline* pipeline = nullptr;
EntityPtr m_entity_in_fly = INVALID_ENTITY;
int frame_countdown = -1;