Merge branch 'master' of https://github.com/tildearrow/furnace into command-palette
This commit is contained in:
commit
8ab1c414b9
434 changed files with 7017 additions and 972 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* Furnace Tracker - multi-system chiptune tracker
|
||||
* Copyright (C) 2021-2023 tildearrow and contributors
|
||||
* Copyright (C) 2021-2024 tildearrow and contributors
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -290,6 +290,7 @@ enum FurnaceGUIColors {
|
|||
GUI_COLOR_INSTR_TED,
|
||||
GUI_COLOR_INSTR_C140,
|
||||
GUI_COLOR_INSTR_C219,
|
||||
GUI_COLOR_INSTR_ESFM,
|
||||
GUI_COLOR_INSTR_UNKNOWN,
|
||||
|
||||
GUI_COLOR_CHANNEL_BG,
|
||||
|
|
@ -1253,8 +1254,10 @@ struct FurnaceGUIMacroDesc {
|
|||
bool isBitfield, blockMode, bit30;
|
||||
String (*hoverFunc)(int,float,void*);
|
||||
void* hoverFuncUser;
|
||||
bool isArp;
|
||||
bool isPitch;
|
||||
|
||||
FurnaceGUIMacroDesc(const char* name, DivInstrumentMacro* m, int macroMin, int macroMax, float macroHeight, ImVec4 col=ImVec4(1.0f,1.0f,1.0f,1.0f), bool block=false, const char* mName=NULL, String (*hf)(int,float,void*)=NULL, bool bitfield=false, const char** bfVal=NULL, unsigned int bitOff=0, bool bit30Special=false, void* hfu=NULL):
|
||||
FurnaceGUIMacroDesc(const char* name, DivInstrumentMacro* m, int macroMin, int macroMax, float macroHeight, ImVec4 col=ImVec4(1.0f,1.0f,1.0f,1.0f), bool block=false, const char* mName=NULL, String (*hf)(int,float,void*)=NULL, bool bitfield=false, const char** bfVal=NULL, unsigned int bitOff=0, bool bit30Special=false, void* hfu=NULL, bool isArp=false, bool isPitch=false):
|
||||
macro(m),
|
||||
height(macroHeight),
|
||||
displayName(name),
|
||||
|
|
@ -1266,7 +1269,9 @@ struct FurnaceGUIMacroDesc {
|
|||
blockMode(block),
|
||||
bit30(bit30Special),
|
||||
hoverFunc(hf),
|
||||
hoverFuncUser(hfu) {
|
||||
hoverFuncUser(hfu),
|
||||
isArp(isArp),
|
||||
isPitch(isPitch) {
|
||||
// MSVC -> hell
|
||||
this->min=macroMin;
|
||||
this->max=macroMax;
|
||||
|
|
@ -1497,11 +1502,12 @@ class FurnaceGUI {
|
|||
void* fmPreviewOPLL;
|
||||
void* fmPreviewOPZ;
|
||||
void* fmPreviewOPZInterface;
|
||||
void* fmPreviewESFM;
|
||||
String* editString;
|
||||
SDL_Event userEvent;
|
||||
|
||||
String pendingRawSample;
|
||||
int pendingRawSampleDepth, pendingRawSampleChannels;
|
||||
int pendingRawSampleDepth, pendingRawSampleChannels, pendingRawSampleRate;
|
||||
bool pendingRawSampleUnsigned, pendingRawSampleBigEndian, pendingRawSampleSwapNibbles, pendingRawSampleReplace;
|
||||
|
||||
ImGuiWindowFlags globalWinFlags;
|
||||
|
|
@ -1623,6 +1629,8 @@ class FurnaceGUI {
|
|||
int roundedWindows;
|
||||
int roundedButtons;
|
||||
int roundedMenus;
|
||||
int roundedTabs;
|
||||
int roundedScrollbars;
|
||||
int loadJapanese;
|
||||
int loadChinese;
|
||||
int loadChineseTraditional;
|
||||
|
|
@ -1821,6 +1829,8 @@ class FurnaceGUI {
|
|||
roundedWindows(1),
|
||||
roundedButtons(1),
|
||||
roundedMenus(0),
|
||||
roundedTabs(1),
|
||||
roundedScrollbars(1),
|
||||
loadJapanese(0),
|
||||
loadChinese(0),
|
||||
loadChineseTraditional(0),
|
||||
|
|
@ -2379,6 +2389,7 @@ class FurnaceGUI {
|
|||
void drawSSGEnv(unsigned char type, const ImVec2& size);
|
||||
void drawWaveform(unsigned char type, bool opz, const ImVec2& size);
|
||||
void drawAlgorithm(unsigned char alg, FurnaceGUIFMAlgs algType, const ImVec2& size);
|
||||
void drawESFMAlgorithm(DivInstrumentESFM& esfm, const ImVec2& size);
|
||||
void drawFMEnv(unsigned char tl, unsigned char ar, unsigned char dr, unsigned char d2r, unsigned char rr, unsigned char sl, unsigned char sus, unsigned char egt, unsigned char algOrGlobalSus, float maxTl, float maxArDr, float maxRr, const ImVec2& size, unsigned short instType);
|
||||
void drawGBEnv(unsigned char vol, unsigned char len, unsigned char sLen, bool dir, const ImVec2& size);
|
||||
bool drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& flags, bool modifyOnChange, bool fromMenu=false);
|
||||
|
|
@ -2390,6 +2401,7 @@ class FurnaceGUI {
|
|||
void renderFMPreviewOPLL(const DivInstrumentFM& params, int pos=0);
|
||||
void renderFMPreviewOPL(const DivInstrumentFM& params, int pos=0);
|
||||
void renderFMPreviewOPZ(const DivInstrumentFM& params, int pos=0);
|
||||
void renderFMPreviewESFM(const DivInstrumentFM& params, const DivInstrumentESFM& esfmParams, int pos=0);
|
||||
|
||||
// these ones offer ctrl-wheel fine value changes.
|
||||
bool CWSliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format=NULL, ImGuiSliderFlags flags=0);
|
||||
|
|
@ -2567,6 +2579,7 @@ class FurnaceGUI {
|
|||
DivSystem systemPicker();
|
||||
void noteInput(int num, int key, int vol=-1);
|
||||
void valueInput(int num, bool direct=false, int target=-1);
|
||||
void orderInput(int num);
|
||||
|
||||
void doGenerateWave();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue