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

remove animation event

Browse source
This commit is contained in:
Mikulas Florek 2021-04-17 12:32:39 +02:00
parent 9c3156c488
commit 5e50c0ae3b
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/animation/editor/controller_editor.cpp
View file

@ -356,6 +356,26 @@ struct ControllerEditorImpl : ControllerEditor {
return *m_event_types[0].get();
}
void removeEvent(OutputMemoryStream& events, u32 idx) const {
OutputMemoryStream tmp(m_app.getAllocator());
InputMemoryStream blob(events);
u32 i = 0;
while(blob.getPosition() != blob.size()) {
const u32 type = blob.read<u32>();
const u16 data_size = blob.read<u16>();
u16* rel_time = (u16*)blob.skip(sizeof(u16));
u8* data = (u8*)blob.skip(data_size);
if (i != idx) {
tmp.write(type);
tmp.write(data_size);
tmp.write(*rel_time);
tmp.write(data, data_size);
}
++i;
}
events = static_cast<OutputMemoryStream&&>(tmp);
}
bool editEvents(OutputMemoryStream& events) {
if (!ImGui::TreeNode("Events")) return false;
ImGui::SameLine(ImGui::GetWindowContentRegionMax().x - ImGui::CalcTextSize(ICON_FA_PLUS_CIRCLE).x);
@ -373,7 +393,16 @@ struct ControllerEditorImpl : ControllerEditor {
ASSERT(data_size == type_obj.size);
u16* rel_time = (u16*)blob.skip(sizeof(u16));
u8* data = (u8*)blob.skip(type_obj.size);
if (ImGui::TreeNode((void*)(uintptr)i, "%d %s", i, type_obj.label.data)) {
bool open = ImGui::TreeNodeEx((void*)(uintptr)i, ImGuiTreeNodeFlags_AllowItemOverlap, "%d %s", i, type_obj.label.data);
ImGui::SameLine(ImGui::GetWindowContentRegionMax().x - ImGui::CalcTextSize(ICON_FA_MINUS_CIRCLE).x);
if (ImGuiEx::IconButton(ICON_FA_MINUS_CIRCLE, "Delete")) {
ImGui::TreePop();
removeEvent(events, i - 1);
break;
}
if (open) {
ImGuiEx::Label("Time");
float t = *rel_time / float(0xffff);
if (ImGui::DragFloat("##t", &t, 0.01f, 0.f, 1.f, "%.2f", ImGuiSliderFlags_AlwaysClamp)) {

1
src/audio/editor/audio_plugins.cpp
View file

@ -123,6 +123,7 @@ struct AssetBrowserPlugin final : AssetBrowser::IPlugin, AssetCompiler::IPlugin
AudioDevice::BufferHandle handle = device.createBuffer(clip->getData(), clip->getSize(), clip->getChannels(), clip->getSampleRate(), 0);
if (handle != AudioDevice::INVALID_BUFFER_HANDLE) {
device.setVolume(handle, clip->m_volume);
device.play(handle, true);
m_playing_clip = handle;
}