otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

release v0.5.2

Browse source 
FAST
This commit is contained in:
tildearrow 2022-02-05 03:10:19 -05:00
parent 07c53b3f5e
commit 34ec189be5
4 changed files with 49 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -10,7 +10,7 @@ set(CMAKE_CXX_STANDARD 14)
set(CMAKE_PROJECT_VERSION_MAJOR 0) set(CMAKE_PROJECT_VERSION_MAJOR 0)
set(CMAKE_PROJECT_VERSION_MINOR 5) set(CMAKE_PROJECT_VERSION_MINOR 5)
set(CMAKE_PROJECT_VERSION_PATCH 1) set(CMAKE_PROJECT_VERSION_PATCH 2)
if (ANDROID) if (ANDROID)
set(BUILD_GUI_DEFAULT OFF) set(BUILD_GUI_DEFAULT OFF)

6
res/Info.plist
View file

@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>0.5.1</string> <string>0.5.2</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>Furnace</string> <string>Furnace</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.5.1</string> <string>0.5.2</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0.5.1</string> <string>0.5.2</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string></string> <string></string>
<key>NSHighResolutionCapable</key> <key>NSHighResolutionCapable</key>

4
src/engine/engine.h
View file

@ -11,8 +11,8 @@
#include <map> #include <map>
#include <queue> #include <queue>
#define DIV_VERSION "0.5.2pre3" #define DIV_VERSION "0.5.2"
#define DIV_ENGINE_VERSION 39 #define DIV_ENGINE_VERSION 40
enum DivStatusView { enum DivStatusView {
DIV_STATUS_NOTHING=0, DIV_STATUS_NOTHING=0,

63
src/gui/gui.cpp
View file

@ -2624,10 +2624,27 @@ void FurnaceGUI::drawPattern() {
for (int i=0; i<chans; i++) { for (int i=0; i<chans; i++) {
if (!e->song.chanShow[i]) continue; if (!e->song.chanShow[i]) continue;
ImGui::TableNextColumn(); ImGui::TableNextColumn();
bool displayTooltip=false;
if (e->song.chanCollapse[i]) { if (e->song.chanCollapse[i]) {
snprintf(chanID,256,"%s##_CH%d",e->getChannelShortName(i),i); const char* chName=e->getChannelShortName(i);
if (strlen(chName)>3) {
snprintf(chanID,256,"...##_CH%d",i);
} else {
snprintf(chanID,256,"%s##_CH%d",chName,i);
}
displayTooltip=true;
} else { } else {
snprintf(chanID,256," %s##_CH%d",e->getChannelName(i),i); const char* chName=e->getChannelName(i);
size_t chNameLimit=6+4*e->song.pat[i].effectRows;
if (strlen(chName)>chNameLimit) {
String shortChName=chName;
shortChName.resize(chNameLimit-3);
shortChName+="...";
snprintf(chanID,256," %s##_CH%d",shortChName.c_str(),i);
displayTooltip=true;
} else {
snprintf(chanID,256," %s##_CH%d",chName,i);
}
} }
bool muted=e->isChannelMuted(i); bool muted=e->isChannelMuted(i);
ImVec4 chanHead=muted?uiColors[GUI_COLOR_CHANNEL_MUTED]:uiColors[GUI_COLOR_CHANNEL_FM+e->getChannelType(i)]; ImVec4 chanHead=muted?uiColors[GUI_COLOR_CHANNEL_MUTED]:uiColors[GUI_COLOR_CHANNEL_FM+e->getChannelType(i)];
@ -2643,6 +2660,9 @@ void FurnaceGUI::drawPattern() {
ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg,ImGui::GetColorU32(chanHead)); ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg,ImGui::GetColorU32(chanHead));
if (muted) ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_CHANNEL_MUTED]); if (muted) ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_CHANNEL_MUTED]);
ImGui::Selectable(chanID,true,ImGuiSelectableFlags_NoPadWithHalfSpacing,ImVec2(0.0f,lineHeight+1.0f*dpiScale)); ImGui::Selectable(chanID,true,ImGuiSelectableFlags_NoPadWithHalfSpacing,ImVec2(0.0f,lineHeight+1.0f*dpiScale));
if (displayTooltip && ImGui::IsItemHovered()) {
ImGui::SetTooltip("%s",e->getChannelName(i));
}
if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) { if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) {
if (settings.soloAction!=1 && soloTimeout>0 && soloChan==i) { if (settings.soloAction!=1 && soloTimeout>0 && soloChan==i) {
e->toggleSolo(i); e->toggleSolo(i);
@ -5780,24 +5800,27 @@ bool FurnaceGUI::loop() {
ImGui::EndMenu(); ImGui::EndMenu();
} }
if (ImGui::BeginMenu("window")) { if (ImGui::BeginMenu("window")) {
if (ImGui::MenuItem("play/edit controls")) editControlsOpen=!editControlsOpen; if (ImGui::MenuItem("song information",NULL,songInfoOpen)) songInfoOpen=!songInfoOpen;
if (ImGui::MenuItem("song information")) songInfoOpen=!songInfoOpen; if (ImGui::MenuItem("instruments",NULL,insListOpen)) insListOpen=!insListOpen;
if (ImGui::MenuItem("instruments")) insListOpen=!insListOpen; if (ImGui::MenuItem("wavetables",NULL,waveListOpen)) waveListOpen=!waveListOpen;
if (ImGui::MenuItem("instrument editor")) insEditOpen=!insEditOpen; if (ImGui::MenuItem("samples",NULL,sampleListOpen)) sampleListOpen=!sampleListOpen;
if (ImGui::MenuItem("wavetables")) waveListOpen=!waveListOpen; if (ImGui::MenuItem("orders",NULL,ordersOpen)) ordersOpen=!ordersOpen;
if (ImGui::MenuItem("wavetable editor")) waveEditOpen=!waveEditOpen; if (ImGui::MenuItem("pattern",NULL,patternOpen)) patternOpen=!patternOpen;
if (ImGui::MenuItem("samples")) sampleListOpen=!sampleListOpen; if (ImGui::MenuItem("mixer",NULL,mixerOpen)) mixerOpen=!mixerOpen;
if (ImGui::MenuItem("sample editor")) sampleEditOpen=!sampleEditOpen; if (ImGui::MenuItem("channels",NULL,channelsOpen)) channelsOpen=!channelsOpen;
if (ImGui::MenuItem("orders")) ordersOpen=!ordersOpen; if (ImGui::MenuItem("compatibility flags",NULL,compatFlagsOpen)) compatFlagsOpen=!compatFlagsOpen;
if (ImGui::MenuItem("pattern")) patternOpen=!patternOpen; if (ImGui::MenuItem("song comments",NULL,notesOpen)) notesOpen=!notesOpen;
if (ImGui::MenuItem("mixer")) mixerOpen=!mixerOpen; ImGui::Separator();
if (ImGui::MenuItem("oscilloscope")) oscOpen=!oscOpen; if (ImGui::MenuItem("instrument editor",NULL,insEditOpen)) insEditOpen=!insEditOpen;
if (ImGui::MenuItem("volume meter")) volMeterOpen=!volMeterOpen; if (ImGui::MenuItem("wavetable editor",NULL,waveEditOpen)) waveEditOpen=!waveEditOpen;
if (ImGui::MenuItem("statistics")) statsOpen=!statsOpen; if (ImGui::MenuItem("sample editor",NULL,sampleEditOpen)) sampleEditOpen=!sampleEditOpen;
if (ImGui::MenuItem("channels")) channelsOpen=!channelsOpen; ImGui::Separator();
if (ImGui::MenuItem("compatibility flags")) compatFlagsOpen=!compatFlagsOpen; if (ImGui::MenuItem("play/edit controls",NULL,editControlsOpen)) editControlsOpen=!editControlsOpen;
if (ImGui::MenuItem("piano/input pad")) pianoOpen=!pianoOpen; if (ImGui::MenuItem("piano/input pad",NULL,pianoOpen)) pianoOpen=!pianoOpen;
if (ImGui::MenuItem("song comments")) notesOpen=!notesOpen; if (ImGui::MenuItem("oscilloscope",NULL,oscOpen)) oscOpen=!oscOpen;
if (ImGui::MenuItem("volume meter",NULL,volMeterOpen)) volMeterOpen=!volMeterOpen;
if (ImGui::MenuItem("statistics",NULL,statsOpen)) statsOpen=!statsOpen;
ImGui::EndMenu(); ImGui::EndMenu();
} }
if (ImGui::BeginMenu("help")) { if (ImGui::BeginMenu("help")) {