diff --git a/Builds/MacOSX/Icon.icns b/Builds/MacOSX/Icon.icns
index a43cc0c0..9460a6c8 100644
Binary files a/Builds/MacOSX/Icon.icns and b/Builds/MacOSX/Icon.icns differ
diff --git a/Builds/MacOSX_CI/Icon.icns b/Builds/MacOSX_CI/Icon.icns
index a43cc0c0..9460a6c8 100644
Binary files a/Builds/MacOSX_CI/Icon.icns and b/Builds/MacOSX_CI/Icon.icns differ
diff --git a/Builds/VS2017_CI/BenTo_App.vcxproj b/Builds/VS2017_CI/BenTo_App.vcxproj
index cfaa45ec..1135cd47 100644
--- a/Builds/VS2017_CI/BenTo_App.vcxproj
+++ b/Builds/VS2017_CI/BenTo_App.vcxproj
@@ -2415,48 +2415,6 @@
true
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
true
@@ -2744,7 +2702,7 @@
-
+
@@ -2755,7 +2713,7 @@
-
+
@@ -2853,7 +2811,7 @@
-
+
@@ -2946,7 +2904,7 @@
-
+
@@ -2959,7 +2917,7 @@
-
+
@@ -3096,7 +3054,7 @@
-
+
@@ -3106,7 +3064,7 @@
-
+
@@ -3131,7 +3089,7 @@
-
+
@@ -3190,7 +3148,7 @@
-
+
@@ -3330,7 +3288,7 @@
-
+
@@ -3358,7 +3316,7 @@
-
+
@@ -3380,7 +3338,7 @@
-
+
@@ -3541,7 +3499,7 @@
-
+
@@ -3556,9 +3514,6 @@
-
-
-
@@ -3634,7 +3589,6 @@
-
diff --git a/Builds/VS2017_CI/BenTo_App.vcxproj.filters b/Builds/VS2017_CI/BenTo_App.vcxproj.filters
index e3da26f6..875deb22 100644
--- a/Builds/VS2017_CI/BenTo_App.vcxproj.filters
+++ b/Builds/VS2017_CI/BenTo_App.vcxproj.filters
@@ -734,12 +734,6 @@
{F95E7C0F-5663-3942-16BD-5DA277CCDFAA}
-
- {4A208D7E-781B-FBFA-1443-7728B2940D57}
-
-
- {7381F9AE-6C71-1512-0273-33A3D73D1EA7}
-
{D391EFE7-9D9C-64D9-7CA8-C06DBE64F72C}
@@ -3502,87 +3496,6 @@
JUCE Modules\juce_sharedtexture
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
JUCE Modules\juce_timeline\resources
@@ -4194,7 +4107,7 @@
JUCE Modules\juce_audio_basics\utilities
-
+
JUCE Modules\juce_audio_basics
@@ -4227,7 +4140,7 @@
JUCE Modules\juce_audio_devices\sources
-
+
JUCE Modules\juce_audio_devices
@@ -4521,7 +4434,7 @@
JUCE Modules\juce_audio_formats\sampler
-
+
JUCE Modules\juce_audio_formats
@@ -4800,7 +4713,7 @@
JUCE Modules\juce_audio_processors\utilities
-
+
JUCE Modules\juce_audio_processors
@@ -4839,7 +4752,7 @@
JUCE Modules\juce_audio_utils\players
-
+
JUCE Modules\juce_audio_utils
@@ -5250,7 +5163,7 @@
JUCE Modules\juce_core\zip
-
+
JUCE Modules\juce_core
@@ -5280,7 +5193,7 @@
JUCE Modules\juce_data_structures\values
-
+
JUCE Modules\juce_data_structures
@@ -5355,7 +5268,7 @@
JUCE Modules\juce_events\timers
-
+
JUCE Modules\juce_events
@@ -5532,7 +5445,7 @@
JUCE Modules\juce_graphics\placement
-
+
JUCE Modules\juce_graphics
@@ -5952,7 +5865,7 @@
JUCE Modules\juce_gui_basics\windows
-
+
JUCE Modules\juce_gui_basics
@@ -6036,7 +5949,7 @@
JUCE Modules\juce_gui_extra\native
-
+
JUCE Modules\juce_gui_extra
@@ -6102,7 +6015,7 @@
JUCE Modules\juce_opengl\utils
-
+
JUCE Modules\juce_opengl
@@ -6585,7 +6498,7 @@
JUCE Modules\juce_osc\osc
-
+
JUCE Modules\juce_osc
@@ -6630,15 +6543,6 @@
JUCE Modules\juce_sharedtexture
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
JUCE Modules\juce_timeline\resources
@@ -6860,9 +6764,6 @@
JUCE Modules\juce_sharedtexture
-
- JUCE Modules\juce_timeline\resources\timeline_resources\JuceLibraryCode
-
JUCE Modules\juce_timeline
diff --git a/Builds/VS2017_CI/icon.ico b/Builds/VS2017_CI/icon.ico
index 5de47d3b..8ee30979 100644
Binary files a/Builds/VS2017_CI/icon.ico and b/Builds/VS2017_CI/icon.ico differ
diff --git a/JuceLibraryCode/BinaryData.cpp b/JuceLibraryCode/BinaryData.cpp
index bd658761..7797338b 100644
--- a/JuceLibraryCode/BinaryData.cpp
+++ b/JuceLibraryCode/BinaryData.cpp
@@ -566,112 +566,112 @@ const char* video_png = (const char*) temp_binary_data_9;
//================== default.btlayout ==================
static const unsigned char temp_binary_data_10[] =
-"{\r\n"
-" \"mainLayout\": {\r\n"
-" \"type\": 1,\r\n"
-" \"width\": 1920,\r\n"
-" \"height\": 997,\r\n"
-" \"direction\": 2,\r\n"
-" \"shifters\": [\r\n"
-" {\r\n"
-" \"type\": 1,\r\n"
-" \"width\": 1920,\r\n"
-" \"height\": 997,\r\n"
-" \"direction\": 2,\r\n"
-" \"shifters\": [\r\n"
-" {\r\n"
-" \"type\": 1,\r\n"
-" \"width\": 1920,\r\n"
-" \"height\": 638,\r\n"
-" \"direction\": 1,\r\n"
-" \"shifters\": [\r\n"
-" {\r\n"
-" \"type\": 0,\r\n"
-" \"width\": 280,\r\n"
-" \"height\": 638,\r\n"
-" \"currentContent\": \"Blocks\",\r\n"
-" \"tabs\": [\r\n"
-" {\r\n"
-" \"name\": \"Blocks\"\r\n"
-" }\r\n"
-" ]\r\n"
-" },\r\n"
-" {\r\n"
-" \"type\": 0,\r\n"
-" \"width\": 1297,\r\n"
-" \"height\": 638,\r\n"
-" \"currentContent\": \"Node Editor\",\r\n"
-" \"tabs\": [\r\n"
-" {\r\n"
-" \"name\": \"Node Editor\"\r\n"
-" },\r\n"
-" {\r\n"
-" \"name\": \"Timeline Editor\"\r\n"
-" },\r\n"
-" {\r\n"
-" \"name\": \"Spatializer Editor\"\r\n"
-" }\r\n"
-" ]\r\n"
-" },\r\n"
-" {\r\n"
-" \"type\": 0,\r\n"
-" \"width\": 329,\r\n"
-" \"height\": 638,\r\n"
-" \"currentContent\": \"Inspector\",\r\n"
-" \"tabs\": [\r\n"
-" {\r\n"
-" \"name\": \"Inspector\"\r\n"
-" }\r\n"
-" ]\r\n"
-" }\r\n"
-" ]\r\n"
-" },\r\n"
-" {\r\n"
-" \"type\": 1,\r\n"
-" \"width\": 1920,\r\n"
-" \"height\": 352,\r\n"
-" \"direction\": 1,\r\n"
-" \"shifters\": [\r\n"
-" {\r\n"
-" \"type\": 0,\r\n"
-" \"width\": 1348,\r\n"
-" \"height\": 352,\r\n"
-" \"currentContent\": \"Props\",\r\n"
-" \"tabs\": [\r\n"
-" {\r\n"
-" \"name\": \"Props\"\r\n"
-" }\r\n"
-" ]\r\n"
-" },\r\n"
-" {\r\n"
-" \"type\": 0,\r\n"
-" \"width\": 289,\r\n"
-" \"height\": 352,\r\n"
-" \"currentContent\": \"Block Visualizer\",\r\n"
-" \"tabs\": [\r\n"
-" {\r\n"
-" \"name\": \"Block Visualizer\"\r\n"
-" }\r\n"
-" ]\r\n"
-" },\r\n"
-" {\r\n"
-" \"type\": 0,\r\n"
-" \"width\": 269,\r\n"
-" \"height\": 352,\r\n"
-" \"currentContent\": \"Logger\",\r\n"
-" \"tabs\": [\r\n"
-" {\r\n"
-" \"name\": \"Logger\"\r\n"
-" }\r\n"
-" ]\r\n"
-" }\r\n"
-" ]\r\n"
-" }\r\n"
-" ]\r\n"
-" }\r\n"
-" ]\r\n"
-" },\r\n"
-" \"windows\": null\r\n"
+"{\n"
+" \"mainLayout\": {\n"
+" \"type\": 1,\n"
+" \"width\": 1920,\n"
+" \"height\": 997,\n"
+" \"direction\": 2,\n"
+" \"shifters\": [\n"
+" {\n"
+" \"type\": 1,\n"
+" \"width\": 1920,\n"
+" \"height\": 997,\n"
+" \"direction\": 2,\n"
+" \"shifters\": [\n"
+" {\n"
+" \"type\": 1,\n"
+" \"width\": 1920,\n"
+" \"height\": 638,\n"
+" \"direction\": 1,\n"
+" \"shifters\": [\n"
+" {\n"
+" \"type\": 0,\n"
+" \"width\": 280,\n"
+" \"height\": 638,\n"
+" \"currentContent\": \"Blocks\",\n"
+" \"tabs\": [\n"
+" {\n"
+" \"name\": \"Blocks\"\n"
+" }\n"
+" ]\n"
+" },\n"
+" {\n"
+" \"type\": 0,\n"
+" \"width\": 1297,\n"
+" \"height\": 638,\n"
+" \"currentContent\": \"Node Editor\",\n"
+" \"tabs\": [\n"
+" {\n"
+" \"name\": \"Node Editor\"\n"
+" },\n"
+" {\n"
+" \"name\": \"Timeline Editor\"\n"
+" },\n"
+" {\n"
+" \"name\": \"Spatializer Editor\"\n"
+" }\n"
+" ]\n"
+" },\n"
+" {\n"
+" \"type\": 0,\n"
+" \"width\": 329,\n"
+" \"height\": 638,\n"
+" \"currentContent\": \"Inspector\",\n"
+" \"tabs\": [\n"
+" {\n"
+" \"name\": \"Inspector\"\n"
+" }\n"
+" ]\n"
+" }\n"
+" ]\n"
+" },\n"
+" {\n"
+" \"type\": 1,\n"
+" \"width\": 1920,\n"
+" \"height\": 352,\n"
+" \"direction\": 1,\n"
+" \"shifters\": [\n"
+" {\n"
+" \"type\": 0,\n"
+" \"width\": 1348,\n"
+" \"height\": 352,\n"
+" \"currentContent\": \"Props\",\n"
+" \"tabs\": [\n"
+" {\n"
+" \"name\": \"Props\"\n"
+" }\n"
+" ]\n"
+" },\n"
+" {\n"
+" \"type\": 0,\n"
+" \"width\": 289,\n"
+" \"height\": 352,\n"
+" \"currentContent\": \"Block Visualizer\",\n"
+" \"tabs\": [\n"
+" {\n"
+" \"name\": \"Block Visualizer\"\n"
+" }\n"
+" ]\n"
+" },\n"
+" {\n"
+" \"type\": 0,\n"
+" \"width\": 269,\n"
+" \"height\": 352,\n"
+" \"currentContent\": \"Logger\",\n"
+" \"tabs\": [\n"
+" {\n"
+" \"name\": \"Logger\"\n"
+" }\n"
+" ]\n"
+" }\n"
+" ]\n"
+" }\n"
+" ]\n"
+" }\n"
+" ]\n"
+" },\n"
+" \"windows\": null\n"
"}";
const char* default_btlayout = (const char*) temp_binary_data_10;
@@ -2122,43 +2122,43 @@ const char* new_png = (const char*) temp_binary_data_14;
//================== shader.frag ==================
static const unsigned char temp_binary_data_15[] =
-"#version 150\r\n"
-"\r\n"
-"\r\n"
-"\r\n"
-"out vec4 outputColor;\r\n"
-"\r\n"
-"//perso\r\n"
-"uniform int inverse;\r\n"
-"uniform vec2 fboSize;\r\n"
-"uniform vec2 sourceSize;\r\n"
-"uniform sampler2DRect sourceTex;\r\n"
-"uniform sampler2DRect ledMap;\r\n"
-"//uniform float pixMaps[65536];\r\n"
-"\r\n"
-"void main()\r\n"
-"{\r\n"
-" // gl_FragCoord contains the window relative coordinate for the fragment.\r\n"
-" // we use gl_FragCoord.x position to control the red color value.\r\n"
-" // we use gl_FragCoord.y position to control the green color value.\r\n"
-" // please note that all r, g, b, a values are between 0 and 1.\r\n"
-" \r\n"
-"\t//ivec2 lsize = textureSize(ledMap,0);\r\n"
-" //ivec2 tsize = textureSize(sourceTex,0);\r\n"
-" \r\n"
-" vec2 lsize = fboSize; //led map is same size as fbo\r\n"
-" vec2 tsize = sourceSize;\r\n"
-" \r\n"
-"\tfloat tx = (gl_FragCoord.x / fboSize.x) * lsize.x;\r\n"
-"\tfloat ty = (gl_FragCoord.y / fboSize.y) * lsize.y;\r\n"
-"\r\n"
-"\tvec4 tcoord = texture(ledMap,vec2(tx,ty));\r\n"
-"\r\n"
-" if(inverse == 1) tcoord.y = 1-tcoord.y;\r\n"
-"\toutputColor = texture(sourceTex,vec2(tcoord.x*tsize.x,tcoord.y*tsize.y));\r\n"
-" \r\n"
-"}\r\n"
-"\r\n";
+"#version 150\n"
+"\n"
+"\n"
+"\n"
+"out vec4 outputColor;\n"
+"\n"
+"//perso\n"
+"uniform int inverse;\n"
+"uniform vec2 fboSize;\n"
+"uniform vec2 sourceSize;\n"
+"uniform sampler2DRect sourceTex;\n"
+"uniform sampler2DRect ledMap;\n"
+"//uniform float pixMaps[65536];\n"
+"\n"
+"void main()\n"
+"{\n"
+" // gl_FragCoord contains the window relative coordinate for the fragment.\n"
+" // we use gl_FragCoord.x position to control the red color value.\n"
+" // we use gl_FragCoord.y position to control the green color value.\n"
+" // please note that all r, g, b, a values are between 0 and 1.\n"
+" \n"
+"\t//ivec2 lsize = textureSize(ledMap,0);\n"
+" //ivec2 tsize = textureSize(sourceTex,0);\n"
+" \n"
+" vec2 lsize = fboSize; //led map is same size as fbo\n"
+" vec2 tsize = sourceSize;\n"
+" \n"
+"\tfloat tx = (gl_FragCoord.x / fboSize.x) * lsize.x;\n"
+"\tfloat ty = (gl_FragCoord.y / fboSize.y) * lsize.y;\n"
+"\n"
+"\tvec4 tcoord = texture(ledMap,vec2(tx,ty));\n"
+"\n"
+" if(inverse == 1) tcoord.y = 1-tcoord.y;\n"
+"\toutputColor = texture(sourceTex,vec2(tcoord.x*tsize.x,tcoord.y*tsize.y));\n"
+" \n"
+"}\n"
+"\n";
const char* shader_frag = (const char*) temp_binary_data_15;
@@ -2183,12 +2183,12 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes)
case 0xcdd754b5: numBytes = 2116; return script_png;
case 0x576fad2b: numBytes = 1253; return timeline_png;
case 0x4f784065: numBytes = 6004; return video_png;
- case 0x7448d63a: numBytes = 2650; return default_btlayout;
+ case 0x7448d63a: numBytes = 2544; return default_btlayout;
case 0x78c8c9ab: numBytes = 1868; return fadeIn_png;
case 0xeac7f79c: numBytes = 392; return fadeOut_png;
case 0xd4093963: numBytes = 98974; return icon_png;
case 0x6e00bb0a: numBytes = 675; return new_png;
- case 0x893e7e0c: numBytes = 1012; return shader_frag;
+ case 0x893e7e0c: numBytes = 975; return shader_frag;
default: break;
}
diff --git a/JuceLibraryCode/BinaryData.h b/JuceLibraryCode/BinaryData.h
index d52dc071..55a6d767 100644
--- a/JuceLibraryCode/BinaryData.h
+++ b/JuceLibraryCode/BinaryData.h
@@ -39,7 +39,7 @@ namespace BinaryData
const int video_pngSize = 6004;
extern const char* default_btlayout;
- const int default_btlayoutSize = 2650;
+ const int default_btlayoutSize = 2544;
extern const char* fadeIn_png;
const int fadeIn_pngSize = 1868;
@@ -54,7 +54,7 @@ namespace BinaryData
const int new_pngSize = 675;
extern const char* shader_frag;
- const int shader_fragSize = 1012;
+ const int shader_fragSize = 975;
// Number of elements in the namedResourceList and originalFileNames arrays.
const int namedResourceListSize = 16;
diff --git a/JuceLibraryCode/include_juce_organicui2.cpp b/JuceLibraryCode/include_juce_organicui2.cpp
index 7f9be780..caf56e8f 100644
--- a/JuceLibraryCode/include_juce_organicui2.cpp
+++ b/JuceLibraryCode/include_juce_organicui2.cpp
@@ -1,9 +1,9 @@
-/*
-
- IMPORTANT! This file is auto-generated each time you save your
- project - if you alter its contents, your changes may be overwritten!
-
-*/
-
-#include "AppConfig.h"
-#include
+/*
+
+ IMPORTANT! This file is auto-generated each time you save your
+ project - if you alter its contents, your changes may be overwritten!
+
+*/
+
+#include "AppConfig.h"
+#include
diff --git a/Source/Timeline/TimelineBlockSequence.cpp b/Source/Timeline/TimelineBlockSequence.cpp
index 598d9b36..1bae4064 100644
--- a/Source/Timeline/TimelineBlockSequence.cpp
+++ b/Source/Timeline/TimelineBlockSequence.cpp
@@ -25,7 +25,7 @@ TimelineBlockSequence::TimelineBlockSequence() :
layerFactory.defs.add(new SequenceLayerManager::LayerDefinition("", "Actions", &ActionLayer::create, this));
layerFactory.defs.add(new SequenceLayerManager::LayerDefinition("", "Audio", &AudioLayer::create, this));
- layerManager->addItem(new LightBlockLayer(this, &clusterGroupManager));
+ layerManager->addItem(new LightBlockLayer(this));
layerManager->addBaseManagerListener(this);
setAudioDeviceManager(&AudioManager::getInstance()->am);
}