Skip to content

Commit

Permalink
Add polyphony and Random Wrangler module (#18)
Browse files Browse the repository at this point in the history
Added: Random Wrangler (RW)
Added: Polyphony to simple oscillators (SIN, SAW, SQR, TRI), plus oscillators (SIN+, SAW+, SQR+, TRI+), Simplex Oscillator (SN-OSC), Wavetable Oscillator (WAVE), TT-A and TT-L. Huge thanks to @baconpaul for contributing with this!
Behind the scenes: Refactored WAVE for performance improvements.
Behind the scenes: Improved screenshot generation
  • Loading branch information
thomassidor authored Dec 2, 2019
1 parent 49033ec commit d4548d8
Show file tree
Hide file tree
Showing 50 changed files with 6,462 additions and 4,216 deletions.
12 changes: 12 additions & 0 deletions .dir-locals.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
((nil . ((indent-tabs-mode . nil)))

(c-mode . ((c-file-style . "linux")
(tab-width . 2)
(c-basic-offset . 2)
))

(c++-mode . ((c-file-style . "linux")
(tab-width . 2)
(c-basic-offset . 2)
))
)
28 changes: 21 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ SOURCES += $(wildcard src/*.cpp src/utility/*.cpp)
DISTRIBUTABLES += res
DISTRIBUTABLES += $(wildcard LICENSE*)

install-run: install
"/c/Program Files/VCV/Rack/Rack.exe"

river-bed-theme:
mkdir -p res/panels-river-bed
cp res/panels/* res/panels-river-bed/
Expand Down Expand Up @@ -82,7 +85,24 @@ updatethemes: allthemes install
# Be sure to place this BEFORE `include` directives, if any.
THIS_FILE := $(lastword $(MAKEFILE_LIST))

screenshots:
screenshots: module-screenshot combined-screenshots

combined-screenshots:
magick montage -density 300 -tile 0x2 -background none -geometry +5+5 module-screenshots/default/*.png combined-screenshots/default.png
magick montage -density 300 -tile 0x2 -background none -geometry +5+5 module-screenshots/river-bed/*.png combined-screenshots/river-bed.png
magick montage -density 300 -tile 0x2 -background none -geometry +5+5 module-screenshots/shark/*.png combined-screenshots/shark.png
magick montage -density 300 -tile 0x2 -background none -geometry +5+5 module-screenshots/oxford-blue/*.png combined-screenshots/oxford-blue.png
magick montage -density 300 -tile 0x2 -background none -geometry +5+5 module-screenshots/cod-gray/*.png combined-screenshots/cod-gray.png
magick montage -density 300 -tile 0x2 -background none -geometry +5+5 module-screenshots/firefly/*.png combined-screenshots/firefly.png

convert combined-screenshots/default.png -resize 50%x50% combined-screenshots/default.png
convert combined-screenshots/river-bed.png -resize 50%x50% combined-screenshots/river-bed.png
convert combined-screenshots/shark.png -resize 50%x50% combined-screenshots/shark.png
convert combined-screenshots/oxford-blue.png -resize 50%x50% combined-screenshots/oxford-blue.png
convert combined-screenshots/cod-gray.png -resize 50%x50% combined-screenshots/cod-gray.png
convert combined-screenshots/firefly.png -resize 50%x50% combined-screenshots/firefly.png

module-screenshots:
# Clean up
rm -f /C/Users/mail/Documents/Rack/screenshots/TinyTricks/*
#Default theme
Expand All @@ -91,47 +111,41 @@ screenshots:
mkdir -p module-screenshots/default
cp /C/Users/mail/Documents/Rack/screenshots/TinyTricks/* module-screenshots/default/
rm -f /C/Users/mail/Documents/Rack/screenshots/TinyTricks/*
magick convert module-screenshots/default/*.png +append combined-screenshots/default.png
# River bed
sed -i 's/setSkin(0);/setSkin(1);/g' src/shared/shared.cpp
@$(MAKE) -f $(THIS_FILE) install
"/c/Program Files/VCV/Rack/Rack.exe" -t 2.f
mkdir -p module-screenshots/river-bed
cp /C/Users/mail/Documents/Rack/screenshots/TinyTricks/* module-screenshots/river-bed/
rm -f /C/Users/mail/Documents/Rack/screenshots/TinyTricks/*
magick convert module-screenshots/river-bed/*.png +append combined-screenshots/river-bed.png
# Shark
sed -i 's/setSkin(1);/setSkin(2);/g' src/shared/shared.cpp
@$(MAKE) -f $(THIS_FILE) install
"/c/Program Files/VCV/Rack/Rack.exe" -t 2.f
mkdir -p module-screenshots/shark
cp /C/Users/mail/Documents/Rack/screenshots/TinyTricks/* module-screenshots/shark/
rm -f /C/Users/mail/Documents/Rack/screenshots/TinyTricks/*
magick convert module-screenshots/shark/*.png +append combined-screenshots/shark.png
# Oxford blue
sed -i 's/setSkin(2);/setSkin(3);/g' src/shared/shared.cpp
@$(MAKE) -f $(THIS_FILE) install
"/c/Program Files/VCV/Rack/Rack.exe" -t 2.f
mkdir -p module-screenshots/oxford-blue
cp /C/Users/mail/Documents/Rack/screenshots/TinyTricks/* module-screenshots/oxford-blue/
rm -f /C/Users/mail/Documents/Rack/screenshots/TinyTricks/*
magick convert module-screenshots/oxford-blue/*.png +append combined-screenshots/oxford-blue.png
# Cod gray
sed -i 's/setSkin(3);/setSkin(4);/g' src/shared/shared.cpp
@$(MAKE) -f $(THIS_FILE) install
"/c/Program Files/VCV/Rack/Rack.exe" -t 2.f
mkdir -p module-screenshots/cod-gray
cp /C/Users/mail/Documents/Rack/screenshots/TinyTricks/* module-screenshots/cod-gray/
rm -f /C/Users/mail/Documents/Rack/screenshots/TinyTricks/*
magick convert module-screenshots/cod-gray/*.png +append combined-screenshots/cod-gray.png
# Firefly
sed -i 's/setSkin(4);/setSkin(5);/g' src/shared/shared.cpp
@$(MAKE) -f $(THIS_FILE) install
"/c/Program Files/VCV/Rack/Rack.exe" -t 2.f
mkdir -p module-screenshots/firefly
cp /C/Users/mail/Documents/Rack/screenshots/TinyTricks/* module-screenshots/firefly/
rm -f /C/Users/mail/Documents/Rack/screenshots/TinyTricks/*
magick convert module-screenshots/firefly/*.png +append combined-screenshots/firefly.png
# Revert back to default
sed -i 's/setSkin(5);/setSkin(0);/g' src/shared/shared.cpp
@$(MAKE) -f $(THIS_FILE) install
Expand Down
51 changes: 38 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![The current modules](https://github.com/thomassidor/tinytricks/blob/master/combined-screenshots/default.png?raw=true)
![The current modules](/combined-screenshots/default.png?raw=true)

# Tiny Tricks VCV Rack modules

Expand All @@ -14,12 +14,13 @@ All the best, Thomas René Sidor
* [Sample and Hold x16 (SH16)](/docs/sh16.md)
* [Attenuator x8 (A8)](/docs/a8.md)

### Modulation sources/LFOs:
* Modulation Generator (MG1)
* Modulation Generator x8 (MG8)
* Modulation Generator x16 (MG16)
### Modulation sources, random generators, LFOs:
* [Modulation Generator (MG1)](/docs/mg.md)
* [Modulation Generator x8 (MG8)](/docs/mg.md)
* [Modulation Generator x16 (MG16)](/docs/mg.md)
* [Simplex Noise (SN1)](/docs/sn.md)
* [Simplex Noise x8 (SN8)](/docs/sn.md)
* [Random Wrangler (RW)](/docs/rw.md)

### Mixing and muting:
* [Random Mute x8 (RM8)](/docs/rm8.md)
Expand All @@ -40,9 +41,14 @@ All the best, Thomas René Sidor
* Simplex Oscillator (SN-OSC)
* [Wavetable Oscillator (WAVE)](/docs/wave.md)

## Authors
@thomassidor - Project owner.

### Color themes
Several [color themes](#color-themes) are included for each module:
@baconpaul - Added polyphony to oscillator, logic and arithmetic modules.


## Color themes
Several color themes are included for each module:

* Light (Default)
* River Bed
Expand All @@ -54,15 +60,34 @@ Several [color themes](#color-themes) are included for each module:

For all themes you can force the input ports to use a light theme, if you prefer the increased contrast. The option is available via right clicking the modules.

![Default color theme](https://github.com/thomassidor/tinytricks/blob/master/combined-screenshots/default.png?raw=true)
![River Bed](https://github.com/thomassidor/tinytricks/blob/master/combined-screenshots/river-bed.png?raw=true)
![Oxford Blue](https://github.com/thomassidor/tinytricks/blob/master/combined-screenshots/oxford-blue.png?raw=true)
![Shark](https://github.com/thomassidor/tinytricks/blob/master/combined-screenshots/shark.png?raw=true)
![Cod Gray](https://github.com/thomassidor/tinytricks/blob/master/combined-screenshots/cod-gray.png?raw=true)
![Firefly](https://github.com/thomassidor/tinytricks/blob/master/combined-screenshots/firefly.png?raw=true)
#### Light (Default)
![Default color theme](/combined-screenshots/default.png?raw=true)

#### River Bed
![River Bed](/combined-screenshots/river-bed.png?raw=true)

#### Oxford Blue
![Oxford Blue](/combined-screenshots/oxford-blue.png?raw=true)

#### Shark
![Shark](/combined-screenshots/shark.png?raw=true)

#### Cod Gray
![Cod Gray](/combined-screenshots/cod-gray.png?raw=true)

#### Firefly
![Firefly](/combined-screenshots/firefly.png?raw=true)



## Changelog

Version 1.5.0
* Added: [Random Wrangler (RW)](/docs/rw.md)
* Added: Polyphony to simple oscillators (SIN, SAW, SQR, TRI), plus oscillators (SIN+, SAW+, SQR+, TRI+), Simplex Oscillator (SN-OSC), Wavetable Oscillator (WAVE), TT-A and TT-L. Huge thanks to @baconpaul for contributing with this!
* Behind the scenes: Refactored WAVE for performance improvements.
* Behind the scenes: Improved screenshot generation

Version 1.4.2
* Added: Dark ports for dark themes.
* Added: Option to force light ports on dark themes.
Expand Down
Loading

0 comments on commit d4548d8

Please sign in to comment.