Browse Source

adding PinkTrombone

tags/22.05
dreamer Filipe Coelho <falktx@falktx.com> 3 years ago
parent
commit
b2fcde5f2e
6 changed files with 37 additions and 0 deletions
  1. +3
    -0
      .gitmodules
  2. +1
    -0
      README.md
  3. +2
    -0
      docs/LICENSES.md
  4. +13
    -0
      plugins/Makefile
  5. +1
    -0
      plugins/PinkTrombone
  6. +17
    -0
      plugins/plugins.cpp

+ 3
- 0
.gitmodules View File

@@ -190,3 +190,6 @@
[submodule "plugins/unless_modules"]
path = plugins/unless_modules
url = https://gitlab.com/unlessgames/unless_modules.git
[submodule "plugins/PinkTrombone"]
path = plugins/PinkTrombone
url = https://github.com/VegaDeftwing/PinkTromboneVCV.git

+ 1
- 0
README.md View File

@@ -155,6 +155,7 @@ At the moment the following 3rd-party modules are provided:
- Orbits
- Parable Instruments
- Path Set
- PinkTrombone
- Prism
- rackwindows
- repelzen


+ 2
- 0
docs/LICENSES.md View File

@@ -61,6 +61,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| Orbits | GPL-3.0-or-later | |
| Parable Instruments | GPL-3.0-or-later | |
| Path Set | GPL-3.0-or-later | |
| PinkTrombone | GPL-3.0-or-later | |
| Prism | BSD-3-Clause | |
| Rackwindows | MIT | |
| repelzen | GPL-3.0-or-later | |
@@ -180,6 +181,7 @@ Below is a list of artwork licenses from plugins
| Orbits/fonts/ShareTechMono-Regular.ttf | OFL-1.1-RFN | |
| ParableInstruments/* | Custom | Copyright © Alex Brandt, [used and distributed with permission](https://github.com/adbrant/ArableInstruments/issues/21) |
| PathSet/* | GPL-3.0-or-later | No artwork specific license provided |
| PinkTrombone/* | GPL-3.0-or-later | No artwork specific license provided |
| Prism/* | CC-BY-SA-4.0 | |
| Prism/RobotoCondensed-Regular.ttf | Apache-2.0 | |
| Rackwindows/* | MIT | [Same license as source code](https://github.com/n0jo/rackwindows/issues/15) |


+ 13
- 0
plugins/Makefile View File

@@ -730,6 +730,12 @@ PARABLE_CUSTOM = Clouds CustomPanel CloudsWidget FreezeLight clouds stmlib

PLUGIN_FILES += $(filter-out PathSet/src/plugin.cpp,$(wildcard PathSet/src/*.cpp))

# --------------------------------------------------------------
# PinkTrombone

PLUGIN_FILES += $(filter-out PinkTrombone/src/plugin.cpp,$(wildcard PinkTrombone/src/*.cpp))
PLUGIN_FILES += $(wildcard PinkTrombone/src/PinkTrombone/*.cpp)

# --------------------------------------------------------------
# Prism

@@ -1664,6 +1670,13 @@ $(BUILD_DIR)/PathSet/%.cpp.o: PathSet/%.cpp
$(foreach m,$(PATHSET_CUSTOM),$(call custom_module_names,$(m),PathSet)) \
-DpluginInstance=pluginInstance__PathSet

$(BUILD_DIR)/PinkTrombone/%.cpp.o: PinkTrombone/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(PINKTROMBONE_CUSTOM),$(call custom_module_names,$(m),PinkTrombone)) \
-DpluginInstance=pluginInstance__PinkTrombone

$(BUILD_DIR)/Prism/%.cpp.o: Prism/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"


+ 1
- 0
plugins/PinkTrombone

@@ -0,0 +1 @@
Subproject commit ea6ab0c6887102ebbf6e3534e0e891b867b130cc

+ 17
- 0
plugins/plugins.cpp View File

@@ -624,6 +624,9 @@ extern Model* modelBlankPanel;
// Path Set
#include "PathSet/src/plugin.hpp"

// PinkTrombone
#include "PinkTrombone/src/plugin.hpp"

// Prism
#include "Prism/src/plugin.hpp"

@@ -733,6 +736,7 @@ Plugin* pluginInstance__nonlinearcircuits;
Plugin* pluginInstance__Orbits;
Plugin* pluginInstance__ParableInstruments;
Plugin* pluginInstance__PathSet;
Plugin* pluginInstance__PinkTrombone;
Plugin* pluginInstance__Prism;
Plugin* pluginInstance__rackwindows;
Plugin* pluginInstance__repelzen;
@@ -2257,6 +2261,18 @@ static void initStatic__PathSet()
}
}

static void initStatic__PinkTrombone()
{
Plugin* const p = new Plugin;
pluginInstance__PinkTrombone = p;

const StaticPluginLoader spl(p, "PinkTrombone");
if (spl.ok())
{
p->addModel(modelPinkTrombone);
}
}

static void initStatic__Prism()
{
Plugin* const p = new Plugin;
@@ -2545,6 +2561,7 @@ void initStaticPlugins()
initStatic__Orbits();
initStatic__ParableInstruments();
initStatic__PathSet();
initStatic__PinkTrombone();
initStatic__Prism();
initStatic__rackwindows();
initStatic__repelzen();


Loading…
Cancel
Save