From d064b10f398d224354cb253789f3e017c2b2a598 Mon Sep 17 00:00:00 2001 From: hperigo Date: Wed, 15 Aug 2018 16:37:40 -0300 Subject: [PATCH 1/4] added getItems() to Timeline.h" --- include/cinder/Timeline.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/cinder/Timeline.h b/include/cinder/Timeline.h index a55c5571b1..20b9b95761 100644 --- a/include/cinder/Timeline.h +++ b/include/cinder/Timeline.h @@ -150,9 +150,11 @@ class CI_API Timeline : public TimelineItem { void insert( TimelineItemRef item ); //! adds an item to the timeline, setting its startTime to be at \a atTime. Safe to use from callback fn's. void insert( TimelineItemRef item, float atTime ) { item->mStartTime = atTime; insert( item ); } - //! Returns the number of items in the Timeline size_t getNumItems() const { return mItems.size(); } + ///! Returns items in the Timeline + std::multimap getItems() const { return mItems; } + std::multimap getItems() { return mItems; } //! Returns true if there are no items in the Timeline bool empty() const { return mItems.empty(); } //! Returns the first item in the timeline the target of which matches \a target @@ -191,6 +193,8 @@ class CI_API Timeline : public TimelineItem { TimelineRef result = std::static_pointer_cast( thisTimelineItem ); return result; } + + //! \cond virtual void stepTo( float absoluteTime, bool /*reverse*/ ) { stepTo( absoluteTime ); } @@ -243,4 +247,4 @@ class CI_API Cue : public TimelineItem { std::function mFunction; }; -} // namespace cinder \ No newline at end of file +} // namespace cinder From 9db470b1babfc8c6398122ef450bebc7f9c39b19 Mon Sep 17 00:00:00 2001 From: hperigo Date: Wed, 15 Aug 2018 16:44:17 -0300 Subject: [PATCH 2/4] removed non const --- include/cinder/Timeline.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/cinder/Timeline.h b/include/cinder/Timeline.h index 20b9b95761..157562f5ab 100644 --- a/include/cinder/Timeline.h +++ b/include/cinder/Timeline.h @@ -152,9 +152,8 @@ class CI_API Timeline : public TimelineItem { void insert( TimelineItemRef item, float atTime ) { item->mStartTime = atTime; insert( item ); } //! Returns the number of items in the Timeline size_t getNumItems() const { return mItems.size(); } - ///! Returns items in the Timeline + ///! Returns all items in the Timeline std::multimap getItems() const { return mItems; } - std::multimap getItems() { return mItems; } //! Returns true if there are no items in the Timeline bool empty() const { return mItems.empty(); } //! Returns the first item in the timeline the target of which matches \a target From 0fc2c52fcadb6506c202f5607c7d27463d9282e9 Mon Sep 17 00:00:00 2001 From: hperigo Date: Sun, 16 Sep 2018 13:47:32 -0300 Subject: [PATCH 3/4] made get items const --- include/cinder/Timeline.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/cinder/Timeline.h b/include/cinder/Timeline.h index 157562f5ab..50e9b7808e 100644 --- a/include/cinder/Timeline.h +++ b/include/cinder/Timeline.h @@ -153,7 +153,7 @@ class CI_API Timeline : public TimelineItem { //! Returns the number of items in the Timeline size_t getNumItems() const { return mItems.size(); } ///! Returns all items in the Timeline - std::multimap getItems() const { return mItems; } + const std::multimap& getItems() { return mItems; } //! Returns true if there are no items in the Timeline bool empty() const { return mItems.empty(); } //! Returns the first item in the timeline the target of which matches \a target From aa3a915d780aaf5a4753fe1aaba1b9a38549eb1e Mon Sep 17 00:00:00 2001 From: hperigo Date: Sun, 16 Sep 2018 15:08:55 -0300 Subject: [PATCH 4/4] added timeline inspection sample --- .../TimelineInspection/include/Resources.h | 9 + .../resources/CinderApp.icns | Bin 0 -> 459637 bytes .../resources/cinder_app_icon.ico | Bin 0 -> 44737 bytes .../src/TimelineInspectionApp.cpp | 277 ++++++++++++++ .../TimelineInspection/vc2015/Resources.rc | 3 + .../vc2015/TimelineInspection.sln | 20 + .../vc2015/TimelineInspection.vcxproj | 118 ++++++ .../vc2015/TimelineInspection.vcxproj.filters | 37 ++ .../TimelineInspection/xcode/Info.plist | 34 ++ .../project.pbxproj | 341 ++++++++++++++++++ .../xcode/TimelineInspection_Prefix.pch | 12 + 11 files changed, 851 insertions(+) create mode 100644 samples/_timeline/TimelineInspection/include/Resources.h create mode 100644 samples/_timeline/TimelineInspection/resources/CinderApp.icns create mode 100644 samples/_timeline/TimelineInspection/resources/cinder_app_icon.ico create mode 100644 samples/_timeline/TimelineInspection/src/TimelineInspectionApp.cpp create mode 100644 samples/_timeline/TimelineInspection/vc2015/Resources.rc create mode 100644 samples/_timeline/TimelineInspection/vc2015/TimelineInspection.sln create mode 100644 samples/_timeline/TimelineInspection/vc2015/TimelineInspection.vcxproj create mode 100644 samples/_timeline/TimelineInspection/vc2015/TimelineInspection.vcxproj.filters create mode 100644 samples/_timeline/TimelineInspection/xcode/Info.plist create mode 100644 samples/_timeline/TimelineInspection/xcode/TimelineInspection.xcodeproj/project.pbxproj create mode 100644 samples/_timeline/TimelineInspection/xcode/TimelineInspection_Prefix.pch diff --git a/samples/_timeline/TimelineInspection/include/Resources.h b/samples/_timeline/TimelineInspection/include/Resources.h new file mode 100644 index 0000000000..a203e762d2 --- /dev/null +++ b/samples/_timeline/TimelineInspection/include/Resources.h @@ -0,0 +1,9 @@ +#pragma once +#include "cinder/CinderResources.h" + +//#define RES_MY_RES CINDER_RESOURCE( ../resources/, image_name.png, 128, IMAGE ) + + + + + diff --git a/samples/_timeline/TimelineInspection/resources/CinderApp.icns b/samples/_timeline/TimelineInspection/resources/CinderApp.icns new file mode 100644 index 0000000000000000000000000000000000000000..e3f05c8962af952ab9eeaa61cf902a6229ccba60 GIT binary patch literal 459637 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