ps
/
Lumenarium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

on site edits

This commit is contained in:
Peter Slattery 2021-09-20 20:20:40 -04:00
parent b32ca1d092
commit d6eabfe3ac
8 changed files with 874 additions and 996 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app_run_tree/data/blumen_animations/ambient_patterns/ambient_1.foldanim
View File

@ -4,7 +4,7 @@ layers_count: 3;
blocks_count: 4;
playable_range:{
min: 0;
max: 2000;
max: 10000;
};
layers:{
layer:{
@ -24,7 +24,7 @@ blocks:{
block:{
frame_range:{
min: 0;
max: 2000;
max: 19;
};
layer_index: 0;
animation_name: "Pattern_BulbMask";
@ -32,7 +32,7 @@ blocks:{
block:{
frame_range:{
min: 0;
max: 2000;
max: 10000;
};
layer_index: 1;
animation_name: "Pattern_Leafy";
@ -40,15 +40,15 @@ blocks:{
block:{
frame_range:{
min: 0;
max: 1032;
max: 5156;
};
layer_index: 2;
animation_name: "Pattern_Rainbow";
};
block:{
frame_range:{
min: 959;
max: 2000;
min: 5040;
max: 10000;
};
layer_index: 2;
animation_name: "Pattern_Wavy";

14
app_run_tree/data/blumen_animations/ambient_patterns/wavy_0.foldanim
View File

@ -1,7 +1,7 @@
lumenarium_animation_file;
animation_name: "wavy_0";
layers_count: 2;
blocks_count: 1;
blocks_count: 2;
playable_range:{
min: 0;
max: 7200;
@ -9,11 +9,11 @@ playable_range:{
layers:{
layer:{
name: "[New Layer]";
blend: "Add";
blend: "Overwrite";
};
layer:{
name: "Color";
blend: "Add";
blend: "Multiply";
};
};
blocks:{
@ -25,4 +25,12 @@ blocks:{
layer_index: 1;
animation_name: "Pattern_Wavy";
};
block:{
frame_range:{
min: 78;
max: 3571;
};
layer_index: 0;
animation_name: "Pattern_Leafy";
};
};

132
app_run_tree/data/blumen_animations/anim_demo.foldanim
View File

@ -1,132 +0,0 @@
lumenarium_animation_file;
animation_name: "demo_anim";
layers_count: 2;
blocks_count: 14;
playable_range:{
min: 0;
max: 10000;
};
layers:{
layer:{
name: "main";
blend: "Add";
};
layer:{
name: "color";
blend: "Multiply";
};
};
blocks:{
block:{
frame_range:{
min: 2428;
max: 3017;
};
layer_index: 0;
animation_name: "Pattern_HueShift";
};
block:{
frame_range:{
min: 1711;
max: 2487;
};
layer_index: 0;
animation_name: "Pattern_Rainbow";
};
block:{
frame_range:{
min: 0;
max: 603;
};
layer_index: 0;
animation_name: "Pattern_VerticalLines";
};
block:{
frame_range:{
min: 2945;
max: 3656;
};
layer_index: 0;
animation_name: "Pattern_Wavy";
};
block:{
frame_range:{
min: 3592;
max: 4296;
};
layer_index: 0;
animation_name: "Pattern_Patchy";
};
block:{
frame_range:{
min: 520;
max: 1225;
};
layer_index: 0;
animation_name: "Pattern_Rotary";
};
block:{
frame_range:{
min: 4218;
max: 4939;
};
layer_index: 0;
animation_name: "Pattern_LeafyPatchy";
};
block:{
frame_range:{
min: 4849;
max: 5431;
};
layer_index: 0;
animation_name: "Pattern_HueShift";
};
block:{
frame_range:{
min: 1149;
max: 1819;
};
layer_index: 0;
animation_name: "Pattern_Leafy";
};
block:{
frame_range:{
min: 5529;
max: 7782;
};
layer_index: 1;
animation_name: "Pattern_Wavy";
};
block:{
frame_range:{
min: 5529;
max: 5979;
};
layer_index: 0;
animation_name: "Pattern_Leafy";
};
block:{
frame_range:{
min: 5912;
max: 6328;
};
layer_index: 0;
animation_name: "Pattern_VerticalLines";
};
block:{
frame_range:{
min: 6281;
max: 6581;
};
layer_index: 0;
animation_name: "Pattern_Rotary";
};
block:{
frame_range:{
min: 6524;
max: 7025;
};
layer_index: 0;
animation_name: "Pattern_HueShift";
};
};

2
src/app/patterns/blumen_patterns.h
View File

@ -328,7 +328,7 @@ Pattern_Leafy(led_buffer* Leds, led_buffer_range Range, assembly Assembly, r32 T
{
DEBUG_TRACK_FUNCTION;
blumen_lumen_state* BLState = (blumen_lumen_state*)UserData;
Time = Time * BLState->PatternSpeed;
Time = Time * BLState->PatternSpeed * .3f;
phrase_hue Hue = BlumenLumen_GetCurrentHue(BLState, Assembly);
v4 C0 = RGBFromPhraseHue(Hue.Hue0);

4
src/app/ss_blumen_lumen/blumen_lumen.cpp
View File

@ -574,6 +574,8 @@ BlumenLumen_CustomUpdate(gs_data UserData, app_state* State, context* Context)
}
}
if (BLState->InPhraseReceptionMode)
{
r32 SecondsSincePhraseBegan = SecondsElapsed(BLState->TimePhraseReceptionBegan, Context->SystemTime_Current);
@ -759,7 +761,7 @@ BlumenLumen_CustomUpdate(gs_data UserData, app_state* State, context* Context)
}
// Dim the leds based on temp data
if (!BLState->DEBUG_IgnoreWeatherDimmingLeds)
if (false && !BLState->DEBUG_IgnoreWeatherDimmingLeds)
{
for (u32 i = 0; i < State->LedSystem.BuffersCount; i++)
{

2
src/app/ss_blumen_lumen/blumen_lumen_settings.h
View File

@ -57,7 +57,7 @@ global time_range LedOnTimes[] = {
{ 00, 00, 06, 30 },
};
global u32 LedOnTimesCount = CArrayLength(LedOnTimes); // do not edit
global b8 DEBUGIgnoreLedOnTimeRange = true;
global b8 DEBUGIgnoreLedOnTimeRange = false;
// How long it takes to fade from the default pattern to the
// voice activated pattern

4
src/sculpture_gen/gen_blumen_lumen.cpp
View File

@ -158,8 +158,8 @@ BuildFlower(gs_string* OutputBuffer, flower_desc Desc)
#if 1
// the flower stem
loop_desc FlowerStem = {};
FlowerStem.CenterStart = v3{0, -1.5f, 0};
FlowerStem.CenterEnd = v3{0, .5f, 0};
FlowerStem.CenterStart = v3{0, .5f, 0};
FlowerStem.CenterEnd = v3{0, -1.5f, 0};
FlowerStem.Radius = .05f;
//FlowerStem.SegmentsCount = 6;
FlowerStem.SegmentsCount = 1;