Skip to content

Commit d8527d6

Browse files
committed
fixed things with timeline, still a bug in timeline addon code that repositions keys that have position values outside default linetime duration at loading them from xml file
1 parent 5171509 commit d8527d6

10 files changed

+10
-172
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ CVS/
2525
/bin/data/*elementPosition*.xml
2626
/bin/data/defaultTimeline*.xml
2727
/bin/data/video/house*
28+
/bin/data/timeline/*
29+
bin/data/timeline/*
2830
.frag
2931
.xml
3032

bin/data/defaultColors.xml

-23
This file was deleted.

bin/data/timeline0_0_trackPositions.xml

-32
This file was deleted.

bin/data/timeline0_1_trackPositions.xml

-32
This file was deleted.

bin/data/timeline0_2_trackPositions.xml

-32
This file was deleted.

bin/data/timeline0_3_trackPositions.xml

-32
This file was deleted.

bin/data/timeline0_main_trackPositions.xml

-8
This file was deleted.

bin/data/timeline0_zoomer.xml

-4
This file was deleted.

src/testApp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ void testApp::setup()
241241
//timeline defaults
242242
#ifdef WITH_TIMELINE
243243
useTimeline = false;
244-
timelineDurationSeconds = timelinePreviousDuration = 10.0;
244+
timelineDurationSeconds = timelinePreviousDuration = 100.0;
245245
#endif
246246

247247
// texture for snapshot background

src/timeline.cpp

+7-8
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,21 @@
44
void testApp::timelineSetup(float duration){
55

66
timeline.setup();
7-
8-
timeline.setPageName("main"); //changes the first page name
9-
timeline.addFlags("trigger_main", "main_trigger.xml");
10-
7+
timeline.setWorkingFolder("timeline");
8+
timeline.setDurationInSeconds(duration);
9+
timeline.setPageName("main"); //changes the first page name
10+
timeline.addFlags("trigger_main", "main_trigger.xml");
1111

1212
for(int i = 0; i < 4; i++)
1313
{
1414
timelineAddQuadPage(i);
1515
}
1616

1717
timeline.setLoopType(OF_LOOP_NORMAL);
18-
//timeline.setDurationInFrames(duration);
19-
timeline.setDurationInSeconds(duration);
18+
//timeline.enableSnapToBPM(60.0);
19+
timeline.enableSnapToOtherKeyframes(false);
20+
//timeline.collapseAllTracks();
2021
ofAddListener(timeline.events().bangFired, this, &testApp::timelineTriggerReceived);
21-
timeline.enableSnapToBPM(60.0);
22-
timeline.collapseAllTracks();
2322
}
2423

2524
//--------------------------------------------------------------

0 commit comments

Comments
 (0)