diff --git a/example-curvesAndColors/example-curvesAndColors.sln b/example-curvesAndColors/example-curvesAndColors.sln index 81851c8c..fa9ec6ec 100644 --- a/example-curvesAndColors/example-curvesAndColors.sln +++ b/example-curvesAndColors/example-curvesAndColors.sln @@ -1,23 +1,36 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example-curvesAndColors", "example-curvesAndColors.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openFrameworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openFrameworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example-curvesAndColors", "example-curvesAndColors.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32 - {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32 - {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32 - {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32 - {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32 - {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32 - {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x86.ActiveCfg = Debug|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x86.Build.0 = Debug|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x86.ActiveCfg = Release|Win32 + {5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x86.Build.0 = Release|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x86.ActiveCfg = Debug|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x86.Build.0 = Debug|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x86.ActiveCfg = Release|Win32 + {7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/example-curvesAndColors/example-curvesAndColors.suo b/example-curvesAndColors/example-curvesAndColors.suo deleted file mode 100644 index 77eed7a7..00000000 Binary files a/example-curvesAndColors/example-curvesAndColors.suo and /dev/null differ diff --git a/example-curvesAndColors/example-curvesAndColors.vcxproj b/example-curvesAndColors/example-curvesAndColors.vcxproj index 3164c3e3..c5b2ef3f 100644 --- a/example-curvesAndColors/example-curvesAndColors.vcxproj +++ b/example-curvesAndColors/example-curvesAndColors.vcxproj @@ -1,78 +1,140 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {7FD42DF7-442E-479A-BA76-D0022F99702A} - example-curvesAndColors Win32Proj + example_cameraTrack + + Application + Unicode + v140 + + + Application + Unicode + v140 + Application Unicode true + v140 - + Application Unicode + true + v140 - - + + + + + - + + + + + - - <_ProjectFileVersion>10.0.30319.1 - bin\ - obj\$(Configuration)\ - true - true - bin\ - obj\$(Configuration)\ - false - $(ProjectName)_debug - $(ProjectName) + + bin\ + obj\$(Configuration)\ + $(ProjectName)_debug + true + true + + + bin\ + obj\$(Configuration)\ + $(ProjectName)_debug + true + true + + + bin\ + obj\$(Configuration)\ + false + + + bin\ + obj\$(Configuration)\ + false Disabled - true EnableFastChecks + %(PreprocessorDefinitions) MultiThreadedDebugDLL - Level3 - EditAndContinue - %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxMSATimer\libs;..\..\..\addons\ofxMSATimer\src;..\..\..\addons\ofxRange\libs;..\..\..\addons\ofxRange\src;..\..\..\addons\ofxTextInputField\libs;..\..\..\addons\ofxTextInputField\src;..\..\..\addons\ofxTimecode\libs;..\..\..\addons\ofxTimecode\src;..\..\..\addons\ofxTimeline\libs;..\..\..\addons\ofxTimeline\src;..\..\..\addons\ofxTimeline\libs\kiss;..\..\..\addons\ofxTimeline\libs\kiss\include;..\..\..\addons\ofxTimeline\libs\kiss\lib;..\..\..\addons\ofxTimeline\libs\kiss\src;..\..\..\addons\ofxTimeline\libs\ofOpenALSoundPlayer_TimelineAdditions\src;..\..\..\addons\ofxTimeline\libs\openal;..\..\..\addons\ofxTimeline\libs\openal\include;..\..\..\addons\ofxTimeline\libs\openal\include\AL;..\..\..\addons\ofxTimeline\libs\openal\libs;..\..\..\addons\ofxTimeline\libs\openal\libs\vs2010;..\..\..\addons\ofxTimeline\libs\openal\libs\vs2010\EFX-Util_MT;..\..\..\addons\ofxTimeline\libs\openal\libs\vs2010\EFX-Util_MTDLL;..\..\..\addons\ofxTimeline\libs\sndfile;..\..\..\addons\ofxTimeline\libs\sndfile\include;..\..\..\addons\ofxTimeline\libs\sndfile\lib;..\..\..\addons\ofxTimeline\libs\sndfile\lib\vs2010;..\..\..\addons\ofxTimeline\libs\sndfile\redist;..\..\..\addons\ofxTimeline\libs\vorbis;..\..\..\addons\ofxTimeline\libs\vorbis\lib;..\..\..\addons\ofxTween\libs;..\..\..\addons\ofxTween\src;..\..\..\addons\ofxTween\src\Easings;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src + $(OF_ROOT)\addons\ofxMSATimer\src;$(OF_ROOT)\addons\ofxRange\src;$(OF_ROOT)\addons\ofxTextInputField\src;$(OF_ROOT)\addons\ofxTimecode\src;$(OF_ROOT)\addons\ofxTimeline\src;$(OF_ROOT)\addons\ofxTween\src;$(OF_ROOT)\addons\ofxTween\src\Easings;$(OF_ROOT)\addons\ofxXmlSettings\src;$(OF_ROOT)\addons\ofxXmlSettings\libs;%(AdditionalIncludeDirectories) + CompileAsCpp - $(OutDir)$(TargetName)$(TargetExt) true - $(TargetDir)$(TargetName)_debugInfo.pdb Console false - - MachineX86 - %(AdditionalDependencies);EFX-Util.lib;OpenAL32.lib;libsndfile-1.lib - %(AdditionalLibraryDirectories);..\..\..\addons\ofxTimeline\libs\openal\libs\vs2010\EFX-Util_MTDLL;..\..\..\addons\ofxTimeline\libs\openal\libs\vs2010\EFX-Util_MT;..\..\..\addons\ofxTimeline\libs\openal\libs\vs2010;..\..\..\addons\ofxTimeline\libs\sndfile\lib\vs2010 + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) - - xcopy /e /i /y "$(ProjectDir)..\..\..\export\vs2010\*.dll" "$(ProjectDir)bin" & xcopy /e /i /y "$(ProjectDir)..\..\..\addons\ofxTimeline\libs\sndfile\redist\*.dll" "$(ProjectDir)bin" + + + robocopy "$(OF_ROOT)/export/vs/$(Platform_Actual)/" "$(ProjectDir)bin/" "*.dll" /njs /njh /np /fp /bytes +if errorlevel 1 exit 0 else exit %errorlevel% + + + + + Disabled + EnableFastChecks + %(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + CompileAsCpp + true + $(OF_ROOT)\addons\ofxMSATimer\src;$(OF_ROOT)\addons\ofxRange\src;$(OF_ROOT)\addons\ofxTextInputField\src;$(OF_ROOT)\addons\ofxTimecode\src;$(OF_ROOT)\addons\ofxTimeline\src;$(OF_ROOT)\addons\ofxTween\src;$(OF_ROOT)\addons\ofxTween\src\Easings;$(OF_ROOT)\addons\ofxXmlSettings\src;$(OF_ROOT)\addons\ofxXmlSettings\libs;%(AdditionalIncludeDirectories) + + + true + Console + false + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + + + robocopy "$(OF_ROOT)/export/vs/$(Platform_Actual)/" "$(ProjectDir)bin/" "*.dll" /njs /njh /np /fp /bytes +if errorlevel 1 exit 0 else exit %errorlevel% @@ -80,10 +142,10 @@ false %(PreprocessorDefinitions) MultiThreadedDLL - Level3 - - %(AdditionalIncludeDirectories);src;..\..\..\addons\ofxMSATimer\libs;..\..\..\addons\ofxMSATimer\src;..\..\..\addons\ofxRange\libs;..\..\..\addons\ofxRange\src;..\..\..\addons\ofxTextInputField\libs;..\..\..\addons\ofxTextInputField\src;..\..\..\addons\ofxTimecode\libs;..\..\..\addons\ofxTimecode\src;..\..\..\addons\ofxTimeline\libs;..\..\..\addons\ofxTimeline\src;..\..\..\addons\ofxTimeline\libs\kiss;..\..\..\addons\ofxTimeline\libs\kiss\include;..\..\..\addons\ofxTimeline\libs\kiss\lib;..\..\..\addons\ofxTimeline\libs\kiss\src;..\..\..\addons\ofxTimeline\libs\ofOpenALSoundPlayer_TimelineAdditions\src;..\..\..\addons\ofxTimeline\libs\openal;..\..\..\addons\ofxTimeline\libs\openal\include;..\..\..\addons\ofxTimeline\libs\openal\include\AL;..\..\..\addons\ofxTimeline\libs\openal\libs;..\..\..\addons\ofxTimeline\libs\openal\libs\vs2010;..\..\..\addons\ofxTimeline\libs\openal\libs\vs2010\EFX-Util_MT;..\..\..\addons\ofxTimeline\libs\openal\libs\vs2010\EFX-Util_MTDLL;..\..\..\addons\ofxTimeline\libs\sndfile;..\..\..\addons\ofxTimeline\libs\sndfile\include;..\..\..\addons\ofxTimeline\libs\sndfile\lib;..\..\..\addons\ofxTimeline\libs\sndfile\lib\vs2010;..\..\..\addons\ofxTimeline\libs\sndfile\redist;..\..\..\addons\ofxTimeline\libs\vorbis;..\..\..\addons\ofxTimeline\libs\vorbis\lib;..\..\..\addons\ofxTween\libs;..\..\..\addons\ofxTween\src;..\..\..\addons\ofxTween\src\Easings;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src + $(OF_ROOT)\addons\ofxMSATimer\src;$(OF_ROOT)\addons\ofxRange\src;$(OF_ROOT)\addons\ofxTextInputField\src;$(OF_ROOT)\addons\ofxTimecode\src;$(OF_ROOT)\addons\ofxTimeline\src;$(OF_ROOT)\addons\ofxTween\src;$(OF_ROOT)\addons\ofxTween\src\Easings;$(OF_ROOT)\addons\ofxXmlSettings\src;$(OF_ROOT)\addons\ofxXmlSettings\libs;%(AdditionalIncludeDirectories) + CompileAsCpp + true false @@ -92,140 +154,159 @@ true true false - - MachineX86 - Default - %(AdditionalDependencies);EFX-Util.lib;OpenAL32.lib;libsndfile-1.lib - %(AdditionalLibraryDirectories);..\..\..\addons\ofxTimeline\libs\openal\libs\vs2010\EFX-Util_MTDLL;..\..\..\addons\ofxTimeline\libs\openal\libs\vs2010\EFX-Util_MT;..\..\..\addons\ofxTimeline\libs\openal\libs\vs2010;..\..\..\addons\ofxTimeline\libs\sndfile\lib\vs2010 + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) - - xcopy /e /i /y "$(ProjectDir)..\..\..\export\vs2010\*.dll" "$(ProjectDir)bin" & xcopy /e /i /y "$(ProjectDir)..\..\..\addons\ofxTimeline\libs\sndfile\redist\*.dll" "$(ProjectDir)bin" + + + robocopy "$(OF_ROOT)/export/vs/$(Platform_Actual)/" "$(ProjectDir)bin/" "*.dll" /njs /njh /np /fp /bytes +if errorlevel 1 exit 0 else exit %errorlevel% + + + + + false + %(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + $(OF_ROOT)\addons\ofxMSATimer\src;$(OF_ROOT)\addons\ofxRange\src;$(OF_ROOT)\addons\ofxTextInputField\src;$(OF_ROOT)\addons\ofxTimecode\src;$(OF_ROOT)\addons\ofxTimeline\src;$(OF_ROOT)\addons\ofxTween\src;$(OF_ROOT)\addons\ofxTween\src\Easings;$(OF_ROOT)\addons\ofxXmlSettings\src;$(OF_ROOT)\addons\ofxXmlSettings\libs;%(AdditionalIncludeDirectories) + CompileAsCpp + + + false + false + Console + true + true + false + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + + + robocopy "$(OF_ROOT)/export/vs/$(Platform_Actual)/" "$(ProjectDir)bin/" "*.dll" /njs /njh /np /fp /bytes +if errorlevel 1 exit 0 else exit %errorlevel% - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + {5837595d-aca9-485c-8e76-729040ce4b0b} + + + /D_DEBUG %(AdditionalOptions) + /D_DEBUG %(AdditionalOptions) + $(OF_ROOT)\libs\openFrameworksCompiled\project\vs + + - + + + + + \ No newline at end of file diff --git a/example-curvesAndColors/example-curvesAndColors.vcxproj.filters b/example-curvesAndColors/example-curvesAndColors.vcxproj.filters index 0079ae59..75e93568 100644 --- a/example-curvesAndColors/example-curvesAndColors.vcxproj.filters +++ b/example-curvesAndColors/example-curvesAndColors.vcxproj.filters @@ -1,173 +1,152 @@  - - src - - - src - src - - src - - - addons\ofxMSATimer\src - - - addons\ofxTextInputField\src - - - addons\ofxTimecode\src - - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - - addons\ofxTimeline\src + + addons\ofxMSATimer\src - - addons\ofxTimeline\src + + addons\ofxTextInputField\src - - addons\ofxTimeline\libs\kiss\src + + addons\ofxTimecode\src - - addons\ofxTimeline\libs\kiss\src + + addons\ofxTween\src - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - - addons\ofxTween\src - - + addons\ofxXmlSettings\src - + addons\ofxXmlSettings\libs - + addons\ofxXmlSettings\libs - + addons\ofxXmlSettings\libs - - addons\ofxTimeline\libs\ofOpenALSoundPlayer_TimelineAdditions + + src @@ -175,270 +154,204 @@ {d8376475-7454-4a24-b08a-aac121d3ad6f} - {71834f65-f3a9-211e-73b8-dc8563776aec} + {6ecac2ba-c702-445b-b45a-f91124335e28} - - {fa2c7f81-95ad-913a-95ee-6d674205f1e6} + + {8153a4ad-a4c6-4a4e-af9b-eb1ae7290c95} - - {21227b69-34ba-dc94-65c0-e08097e60473} + + {95f5e690-6ef9-4850-8a04-838e853ed4ee} - - {c5cf358f-f6d6-0f61-5433-25f14c446730} + + {be95ddaa-741f-4043-a349-01479effbdfd} - - {afee1af4-3be7-35e2-f89c-feb8f18a60fd} + + {210f337d-d1aa-41d8-9c59-c65be5fe3a01} - {a4b02712-30e4-b504-c110-2c93e13629d3} + {5bf0416a-1780-4bab-b6af-dd188d9d9c61} - {b67afc83-af32-6fe3-281f-ac212c044641} + {a4570d43-5551-492f-a539-946b47e4b059} - {1b5cd1f2-714c-1a5f-97d0-2f9712f8476a} + {710740d5-d093-4625-a9f9-5ed7a3edad86} - {1e8626d6-b6a0-d240-f534-c5e88dad08e8} - - - {b6cb78c7-bc44-ad08-8e43-896c4501b36d} - - - {ac132e01-0f0d-5ff9-8d64-8dada9b5aa38} - - - {333c4390-0b4e-eaaa-5cfe-0663c4d2e613} - - - {93d28ed9-a2ca-418a-4538-d3328b5a212b} - - - {239f8b47-5d3c-673b-95de-5e702a695e8a} - - - {5451193a-c0cf-9361-b431-0f7f4f2d31d1} - - - {012014bf-0161-a228-4c75-8d280092ed20} - - - {7d44a927-3ef3-d18b-0302-52624b4bc08e} - - - {994a9be4-6199-2707-46e1-49bcce2417f1} - - - {8b1e05c6-fec0-22b7-592b-3de20a7ffb14} - - - {944e9321-a6f2-45b7-407b-559efee96ee5} - - - {4ed1f364-a201-a241-2587-22239fe8751e} + {4d4384a3-3e2a-4f8c-bdd9-bf436815003b} - {8a8810e8-a79d-7a1d-2f0a-7203302f4656} + {855b891b-82ea-4d8f-a3eb-3ecc29653650} - {40ac4b42-6a5a-9537-eb82-d1b80d647dfc} + {68bb5657-3062-4fd2-adb3-a81edc55075d} - {ef0f6a8b-b04f-e782-21ef-d4ba278d3ee5} + {d500f84b-23b2-43ea-bd31-a6ede535f3cc} - {877f005d-13e6-0592-1d97-f2e39d804d43} + {5e88a33a-c894-4c40-8b51-147a90a4a4be} - {ccb2ac63-49d2-977c-cfe8-aeadb8be6a99} + {de77885f-acde-446f-be1c-253a657e847c} - {687714a8-1662-fa1c-261f-50f068335398} + {1f733fbb-fcca-4b7a-a03b-1d107e3d7229} + + + {e3723df0-1727-4109-90e8-f7dfc0f614d6} + + + {3373bc21-ea5e-4f3a-8f82-c02f060d24b5} - - src - - - src - - - addons\ofxMSATimer\src - - - addons\ofxRange\src - - - addons\ofxTextInputField\src - - - addons\ofxTimecode\src - - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - + addons\ofxTimeline\src - - addons\ofxTimeline\libs\kiss\include - - - addons\ofxTimeline\libs\kiss\include - - - addons\ofxTimeline\libs\kiss\src - - - addons\ofxTimeline\libs\openal\include\AL - - - addons\ofxTimeline\libs\openal\include\AL - - - addons\ofxTimeline\libs\openal\include\AL - - - addons\ofxTimeline\libs\openal\include\AL - - - addons\ofxTimeline\libs\openal\include\AL + + addons\ofxMSATimer\src - - addons\ofxTimeline\libs\openal\include\AL + + addons\ofxTextInputField\src - - addons\ofxTimeline\libs\sndfile\include + + addons\ofxTimecode\src - - addons\ofxTween\src\Easings + + addons\ofxTween\src - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - + addons\ofxTween\src\Easings - - addons\ofxTween\src - - + addons\ofxXmlSettings\src - + addons\ofxXmlSettings\libs - - addons\ofxTimeline\libs\ofOpenALSoundPlayer_TimelineAdditions + + src + + addons\ofxRange\src + + + + \ No newline at end of file diff --git a/example-curvesAndColors/example-curvesAndColors.vcxproj.user b/example-curvesAndColors/example-curvesAndColors.vcxproj.user deleted file mode 100644 index 90d00fb5..00000000 --- a/example-curvesAndColors/example-curvesAndColors.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(TargetDir) - WindowsLocalDebugger - - - $(TargetDir) - WindowsLocalDebugger - - \ No newline at end of file diff --git a/example-curvesAndColors/icon.rc b/example-curvesAndColors/icon.rc new file mode 100644 index 00000000..7e26eb35 --- /dev/null +++ b/example-curvesAndColors/icon.rc @@ -0,0 +1,8 @@ +// Icon Resource Definition +#define MAIN_ICON 102 + +#if defined(_DEBUG) +MAIN_ICON ICON "icon_debug.ico" +#else +MAIN_ICON ICON "icon.ico" +#endif diff --git a/example-curvesAndColors/src/main.cpp b/example-curvesAndColors/src/main.cpp index c9508d76..359ff003 100644 --- a/example-curvesAndColors/src/main.cpp +++ b/example-curvesAndColors/src/main.cpp @@ -5,19 +5,16 @@ * Shows how to use ofxTimeline to create a simple curves and color change */ -#include "ofMain.h" -#include "testApp.h" -#include "ofAppGlutWindow.h" +#include "ofApp.h" //======================================================================== int main( ){ - ofAppGlutWindow window; - ofSetupOpenGL(&window, 1024,768, OF_WINDOW); // <-------- setup the GL context + ofGLWindowSettings settings; + settings.width = 1024; + settings.height = 768; + ofCreateWindow(settings); - // this kicks off the running of my app - // can be OF_WINDOW or OF_FULLSCREEN - // pass in width and height too: - ofRunApp( new testApp()); + ofRunApp(new ofApp()); } diff --git a/example-curvesAndColors/src/testApp.cpp b/example-curvesAndColors/src/ofApp.cpp similarity index 88% rename from example-curvesAndColors/src/testApp.cpp rename to example-curvesAndColors/src/ofApp.cpp index e63c3a6d..a215ceea 100644 --- a/example-curvesAndColors/src/testApp.cpp +++ b/example-curvesAndColors/src/ofApp.cpp @@ -29,10 +29,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "testApp.h" +#include "ofApp.h" //-------------------------------------------------------------- -void testApp::setup(){ +void ofApp::setup(){ ofSetFrameRate(60); ofSetVerticalSync(true); @@ -69,12 +69,12 @@ void testApp::setup(){ } //-------------------------------------------------------------- -void testApp::update(){ +void ofApp::update(){ } //-------------------------------------------------------------- -void testApp::draw(){ +void ofApp::draw(){ ofBackground(.15*255); ofPushMatrix(); @@ -100,47 +100,47 @@ void testApp::draw(){ } //-------------------------------------------------------------- -void testApp::keyPressed(int key){ +void ofApp::keyPressed(int key){ } //-------------------------------------------------------------- -void testApp::keyReleased(int key){ +void ofApp::keyReleased(int key){ } //-------------------------------------------------------------- -void testApp::mouseMoved(int x, int y ){ +void ofApp::mouseMoved(int x, int y ){ } //-------------------------------------------------------------- -void testApp::mouseDragged(int x, int y, int button){ +void ofApp::mouseDragged(int x, int y, int button){ } //-------------------------------------------------------------- -void testApp::mousePressed(int x, int y, int button){ +void ofApp::mousePressed(int x, int y, int button){ } //-------------------------------------------------------------- -void testApp::mouseReleased(int x, int y, int button){ +void ofApp::mouseReleased(int x, int y, int button){ } //-------------------------------------------------------------- -void testApp::windowResized(int w, int h){ +void ofApp::windowResized(int w, int h){ } //-------------------------------------------------------------- -void testApp::gotMessage(ofMessage msg){ +void ofApp::gotMessage(ofMessage msg){ } //-------------------------------------------------------------- -void testApp::dragEvent(ofDragInfo dragInfo){ +void ofApp::dragEvent(ofDragInfo dragInfo){ } \ No newline at end of file diff --git a/example-curvesAndColors/src/testApp.h b/example-curvesAndColors/src/ofApp.h similarity index 98% rename from example-curvesAndColors/src/testApp.h rename to example-curvesAndColors/src/ofApp.h index aaca0c58..aeebc165 100644 --- a/example-curvesAndColors/src/testApp.h +++ b/example-curvesAndColors/src/ofApp.h @@ -34,7 +34,7 @@ #include "ofMain.h" #include "ofxTimeline.h" -class testApp : public ofBaseApp{ +class ofApp : public ofBaseApp{ public: void setup(); diff --git a/ofxTimelineLib/ofxTimeline.props b/ofxTimelineLib/ofxTimeline.props index 141f3ddc..f2067cd9 100644 --- a/ofxTimelineLib/ofxTimeline.props +++ b/ofxTimelineLib/ofxTimeline.props @@ -16,6 +16,10 @@ %(AdditionalLibraryDirectories) + + robocopy "$(OF_ROOT)/addons/ofxTimeline/copy_to_data_GUI/" "$(ProjectDir)bin/data/GUI" /njs /njh /np /fp /bytes + + \ No newline at end of file diff --git a/src/ofxTLAudioTrack.cpp b/src/ofxTLAudioTrack.cpp index 569e627d..98d3f30d 100644 --- a/src/ofxTLAudioTrack.cpp +++ b/src/ofxTLAudioTrack.cpp @@ -143,7 +143,7 @@ void ofxTLAudioTrack::draw(){ for(int i = 0; i < bins.size(); i++){ float height = MIN(bounds.height * bins[i], bounds.height); float y = bounds.y + bounds.height - height; - ofRect(i*binWidth, y, binWidth, height); + ofDrawRectangle(i*binWidth, y, binWidth, height); } ofPopStyle(); diff --git a/src/ofxTLBangs.cpp b/src/ofxTLBangs.cpp index 1d3d6d96..84154b70 100644 --- a/src/ofxTLBangs.cpp +++ b/src/ofxTLBangs.cpp @@ -56,7 +56,7 @@ void ofxTLBangs::draw(){ if(currentPercent > 0){ ofSetColor(timeline->getColors().disabledColor, 100*(currentPercent)); ofFill(); - ofRect(bounds.x, bounds.y, bounds.width, bounds.height); + ofDrawRectangle(bounds); } for(int i = keyframes.size()-1; i >= 0; i--){ @@ -78,7 +78,7 @@ void ofxTLBangs::draw(){ ofSetColor(timeline->getColors().keyColor); } - ofLine(screenX, bounds.y, screenX, bounds.y+bounds.height); + ofDrawLine(screenX, bounds.y, screenX, bounds.y+bounds.height); } ofPopStyle(); diff --git a/src/ofxTLCameraTrack.cpp b/src/ofxTLCameraTrack.cpp index 30a1d6fa..7ccc4995 100644 --- a/src/ofxTLCameraTrack.cpp +++ b/src/ofxTLCameraTrack.cpp @@ -87,7 +87,7 @@ void ofxTLCameraTrack::draw(){ if(lockCameraToTrack){ ofSetColor(timeline->getColors().keyColor, 40*(sin(ofGetElapsedTimef()*5)*.5+.5)+25); ofFill(); - ofRect(bounds); + ofDrawRectangle(bounds); } ofSetColor(timeline->getColors().keyColor); ofNoFill(); @@ -131,7 +131,7 @@ void ofxTLCameraTrack::draw(){ for(int i = 0; i < selectedKeyframes.size(); i++){ float screenX = millisToScreenX( selectedKeyframes[i]->time ); float screenY = bounds.y+bounds.height/2; - ofCircle(screenX, screenY, 4); + ofDrawCircle(screenX, screenY, 4); } ofPopStyle(); @@ -164,11 +164,11 @@ void ofxTLCameraTrack::draw3d(){ n.setPosition(interFrame.position); n.setOrientation(interFrame.orientation); ofSetColor(0,0,255); - ofLine(n.getPosition(), n.getPosition() + n.getLookAtDir()*10); + ofDrawLine(n.getPosition(), n.getPosition() + n.getLookAtDir()*10); ofSetColor(0,255,0); - ofLine(n.getPosition(), n.getPosition() + n.getUpDir()*10); + ofDrawLine(n.getPosition(), n.getPosition() + n.getUpDir()*10); ofSetColor(255,0,0); - ofLine(n.getPosition(), n.getPosition() + n.getSideDir()*10); + ofDrawLine(n.getPosition(), n.getPosition() + n.getSideDir()*10); } setCameraFrameToTime(&interFrame, currentTrackTime()); @@ -177,11 +177,11 @@ void ofxTLCameraTrack::draw3d(){ ofSetLineWidth(3); ofSetColor(0,0,255); - ofLine(n.getPosition(), n.getPosition() + n.getLookAtDir()*25); + ofDrawLine(n.getPosition(), n.getPosition() + n.getLookAtDir()*25); ofSetColor(0,255,0); - ofLine(n.getPosition(), n.getPosition() + n.getUpDir()*25); + ofDrawLine(n.getPosition(), n.getPosition() + n.getUpDir()*25); ofSetColor(255,0,0); - ofLine(n.getPosition(), n.getPosition() + n.getSideDir()*25); + ofDrawLine(n.getPosition(), n.getPosition() + n.getSideDir()*25); ofNoFill(); ofSetColor(255); @@ -194,14 +194,14 @@ void ofxTLCameraTrack::draweEase(CameraTrackEase ease, ofPoint screenPoint, bool switch (ease) { case OFXTL_CAMERA_EASE_LINEAR: if(easeIn){ - ofTriangle(screenPoint.x-bounds.height, screenPoint.y, - screenPoint.x, screenPoint.y, - screenPoint.x, screenPoint.y+bounds.height); + ofDrawTriangle(screenPoint.x-bounds.height, screenPoint.y, + screenPoint.x, screenPoint.y, + screenPoint.x, screenPoint.y+bounds.height); } else{ - ofTriangle(screenPoint.x, screenPoint.y, - screenPoint.x, screenPoint.y+bounds.height, - screenPoint.x+bounds.height, screenPoint.y+bounds.height); + ofDrawTriangle(screenPoint.x, screenPoint.y, + screenPoint.x, screenPoint.y+bounds.height, + screenPoint.x+bounds.height, screenPoint.y+bounds.height); } break; case OFXTL_CAMERA_EASE_SMOOTH: @@ -210,30 +210,30 @@ void ofxTLCameraTrack::draweEase(CameraTrackEase ease, ofPoint screenPoint, bool screenPoint.x-bounds.height/2, screenPoint.y, screenPoint.x, screenPoint.y+bounds.height/2, screenPoint.x, screenPoint.y+bounds.height); - ofLine(screenPoint.x-bounds.height, screenPoint.y, - screenPoint.x, screenPoint.y); - ofLine(screenPoint.x, screenPoint.y, - screenPoint.x, screenPoint.y+bounds.height); + ofDrawLine(screenPoint.x-bounds.height, screenPoint.y, + screenPoint.x, screenPoint.y); + ofDrawLine(screenPoint.x, screenPoint.y, + screenPoint.x, screenPoint.y+bounds.height); } else { ofBezier(screenPoint.x, screenPoint.y, screenPoint.x, screenPoint.y+bounds.height/2, screenPoint.x+bounds.height/2, screenPoint.y+bounds.height, screenPoint.x+bounds.height, screenPoint.y+bounds.height); - ofLine(screenPoint.x, screenPoint.y, - screenPoint.x, screenPoint.y+bounds.height); - ofLine(screenPoint.x, screenPoint.y+bounds.height, - screenPoint.x+bounds.height, screenPoint.y+bounds.height); + ofDrawLine(screenPoint.x, screenPoint.y, + screenPoint.x, screenPoint.y+bounds.height); + ofDrawLine(screenPoint.x, screenPoint.y+bounds.height, + screenPoint.x+bounds.height, screenPoint.y+bounds.height); } break; case OFXTL_CAMERA_EASE_CUT: if(easeIn){ - ofRect(screenPoint.x-bounds.height/2, screenPoint.y, - bounds.height/2, bounds.height/2); + ofDrawRectangle(screenPoint.x-bounds.height/2, screenPoint.y, + bounds.height/2, bounds.height/2); } else{ - ofRect(screenPoint.x, screenPoint.y+bounds.height/2, - bounds.height/2, bounds.height/2); + ofDrawRectangle(screenPoint.x, screenPoint.y+bounds.height/2, + bounds.height/2, bounds.height/2); } break; default: diff --git a/src/ofxTLColorTrack.cpp b/src/ofxTLColorTrack.cpp index 8e807325..9c6f8a32 100644 --- a/src/ofxTLColorTrack.cpp +++ b/src/ofxTLColorTrack.cpp @@ -61,7 +61,7 @@ void ofxTLColorTrack::draw(){ ofPushStyle(); ofSetColor(defaultColor); ofFill(); - ofRect(bounds); + ofDrawRectangle(bounds); ofPopStyle(); } else if(keyframes.size() == 1){ @@ -69,7 +69,7 @@ void ofxTLColorTrack::draw(){ ofxTLColorSample* s = (ofxTLColorSample*)keyframes[0]; ofSetColor(s->color); ofFill(); - ofRect(bounds); + ofDrawRectangle(bounds); ofPopStyle(); } else{ @@ -84,19 +84,19 @@ void ofxTLColorTrack::draw(){ float screenX = millisToScreenX(keyframes[i]->time); - ofPoint a = ofPoint(screenX-10,bounds.y); - ofPoint b = ofPoint(screenX+10,bounds.y); - ofPoint c = ofPoint(screenX,bounds.y+10); + ofVec2f a = ofVec2f(screenX-10,bounds.y); + ofVec2f b = ofVec2f(screenX+10,bounds.y); + ofVec2f c = ofVec2f(screenX,bounds.y+10); ofPushStyle(); ofFill(); ofxTLColorSample* s = (ofxTLColorSample*)keyframes[i]; ofSetColor(s->color); - ofTriangle(a,b,c); + ofDrawTriangle(a,b,c); ofNoFill(); ofSetColor(s->color.getInverted()); ofSetLineWidth(1); - ofTriangle(a,b,c); + ofDrawTriangle(a,b,c); if(keyframes[i] == hoverKeyframe){ ofSetColor(timeline->getColors().highlightColor); @@ -109,7 +109,7 @@ void ofxTLColorTrack::draw(){ else{ ofSetColor(s->color.getInverted()); } - ofLine(c, ofVec2f(screenX, bounds.getMaxY())); + ofDrawLine(c, ofVec2f(screenX, bounds.getMaxY())); ofPopStyle(); } } @@ -154,16 +154,16 @@ void ofxTLColorTrack::drawModalContent(){ ofVec2f selectionPoint = colorWindow.getMin() + selectedSample->samplePoint * ofVec2f(colorWindow.width,colorWindow.height); ofSetColor(selectedSample->color.getInverted()); - ofLine(selectionPoint - ofVec2f(8,0), selectionPoint + ofVec2f(8,0)); - ofLine(selectionPoint - ofVec2f(0,8), selectionPoint + ofVec2f(0,8)); + ofDrawLine(selectionPoint - ofVec2f(8,0), selectionPoint + ofVec2f(8,0)); + ofDrawLine(selectionPoint - ofVec2f(0,8), selectionPoint + ofVec2f(0,8)); ofPushStyle(); ofNoFill(); if(previousSample != NULL){ ofVec2f previousSamplePoint = colorWindow.getMin() + previousSample->samplePoint * ofVec2f(colorWindow.width,colorWindow.height); ofSetColor(previousSample->color.getInverted(), 150); - ofCircle(previousSamplePoint, 3); - ofLine(previousSamplePoint,selectionPoint); + ofDrawCircle(previousSamplePoint, 3); + ofDrawLine(previousSamplePoint,selectionPoint); } if(nextSample != NULL){ ofVec2f nextSamplePoint = colorWindow.getMin() + nextSample->samplePoint * ofVec2f(colorWindow.width,colorWindow.height); @@ -172,10 +172,10 @@ void ofxTLColorTrack::drawModalContent(){ //draw a little triangle pointer ofVec2f direction = (nextSamplePoint - selectionPoint).normalized(); ofVec2f backStep = nextSamplePoint-direction*5; - ofTriangle(nextSamplePoint, - backStep + direction.getRotated(90)*3, - backStep - direction.getRotated(90)*3); - ofLine(nextSamplePoint,selectionPoint); + ofDrawTriangle(nextSamplePoint, + backStep + direction.getRotated(90)*3, + backStep - direction.getRotated(90)*3); + ofDrawLine(nextSamplePoint,selectionPoint); } ofPopStyle(); @@ -183,13 +183,13 @@ void ofxTLColorTrack::drawModalContent(){ newColorRect = ofRectangle(colorWindow.x+colorWindow.width/2, colorWindow.getMaxY(), colorWindow.width/2, 25); ofSetColor(colorAtClickTime); - ofRect(previousColorRect); + ofDrawRectangle(previousColorRect); ofSetColor(selectedSample->color); - ofRect(newColorRect); + ofDrawRectangle(newColorRect); ofSetColor(timeline->getColors().keyColor); ofNoFill(); ofSetLineWidth(2); - ofRect(colorWindow); + ofDrawRectangle(colorWindow); ofPopStyle(); } } diff --git a/src/ofxTLCurves.cpp b/src/ofxTLCurves.cpp index 7f85fa5d..3c192133 100644 --- a/src/ofxTLCurves.cpp +++ b/src/ofxTLCurves.cpp @@ -86,17 +86,17 @@ void ofxTLCurves::drawModalContent(){ ofSetColor(80, 80, 80); } ofFill(); - ofRect(easingWindowPosition.x + easingTypes[i]->bounds.x, easingWindowPosition.y + easingTypes[i]->bounds.y, - easingTypes[i]->bounds.width, easingTypes[i]->bounds.height); + ofDrawRectangle(easingWindowPosition.x + easingTypes[i]->bounds.x, easingWindowPosition.y + easingTypes[i]->bounds.y, + easingTypes[i]->bounds.width, easingTypes[i]->bounds.height); ofSetColor(200, 200, 200); timeline->getFont().drawString(easingTypes[i]->name, easingWindowPosition.x + easingTypes[i]->bounds.x+11, easingWindowPosition.y + easingTypes[i]->bounds.y+10); ofNoFill(); ofSetColor(40, 40, 40); - ofRect(easingWindowPosition.x + easingTypes[i]->bounds.x, - easingWindowPosition.y + easingTypes[i]->bounds.y, - easingTypes[i]->bounds.width, easingTypes[i]->bounds.height); + ofDrawRectangle(easingWindowPosition.x + easingTypes[i]->bounds.x, + easingWindowPosition.y + easingTypes[i]->bounds.y, + easingTypes[i]->bounds.width, easingTypes[i]->bounds.height); } for(int i = 0; i < easingFunctions.size(); i++){ @@ -108,8 +108,8 @@ void ofxTLCurves::drawModalContent(){ ofSetColor(80, 80, 80); } ofFill(); - ofRect(easingWindowPosition.x + easingFunctions[i]->bounds.x, easingWindowPosition.y +easingFunctions[i]->bounds.y, - easingFunctions[i]->bounds.width, easingFunctions[i]->bounds.height); + ofDrawRectangle(easingWindowPosition.x + easingFunctions[i]->bounds.x, easingWindowPosition.y +easingFunctions[i]->bounds.y, + easingFunctions[i]->bounds.width, easingFunctions[i]->bounds.height); ofSetColor(200, 200, 200); // timeline->getFont().drawString(easingFunctions[i]->name, // easingWindowPosition.x + easingFunctions[i]->bounds.x+10, @@ -130,8 +130,8 @@ void ofxTLCurves::drawModalContent(){ ofPopMatrix(); ofNoFill(); ofSetColor(40, 40, 40); - ofRect(easingWindowPosition.x + easingFunctions[i]->bounds.x, easingWindowPosition.y +easingFunctions[i]->bounds.y, - easingFunctions[i]->bounds.width, easingFunctions[i]->bounds.height); + ofDrawRectangle(easingWindowPosition.x + easingFunctions[i]->bounds.x, easingWindowPosition.y +easingFunctions[i]->bounds.y, + easingFunctions[i]->bounds.width, easingFunctions[i]->bounds.height); } } diff --git a/src/ofxTLEmptyKeyframes.cpp b/src/ofxTLEmptyKeyframes.cpp index e1d9c425..1fb8e24e 100644 --- a/src/ofxTLEmptyKeyframes.cpp +++ b/src/ofxTLEmptyKeyframes.cpp @@ -49,7 +49,7 @@ void ofxTLEmptyKeyframes::draw(){ ofFill(); //show the current color as background based on the playhead position ofSetColor(getCurrentColor(), 100); - ofRect(bounds); + ofDrawRectangle(bounds); for(int i = 0; i < keyframes.size(); i++){ //make sure it's on screen @@ -67,9 +67,9 @@ void ofxTLEmptyKeyframes::draw(){ ofSetColor(timeline->getColors().keyColor); } ofVec2f screenPoint = screenPositionForKeyframe(emptyKeyframe); - ofCircle(screenPoint, 7); + ofDrawCircle(screenPoint, 7); ofSetColor(emptyKeyframe->color); - ofCircle(screenPoint, 5); + ofDrawCircle(screenPoint, 5); } } diff --git a/src/ofxTLEmptyTrack.cpp b/src/ofxTLEmptyTrack.cpp index 13bf46f2..3bb59b20 100644 --- a/src/ofxTLEmptyTrack.cpp +++ b/src/ofxTLEmptyTrack.cpp @@ -73,7 +73,7 @@ void ofxTLEmptyTrack::draw(){ ofFill(); if(isHovering()){ ofSetColor(timeline->getColors().backgroundColor); - ofRect(bounds); + ofDrawRectangle(bounds); } ofNoFill(); @@ -82,7 +82,7 @@ void ofxTLEmptyTrack::draw(){ float screenX = millisToScreenX(clickPoints[i].time); if(screenX > bounds.x && screenX < bounds.x+bounds.width){ float screenY = ofMap(clickPoints[i].value, 0.0, 1.0, bounds.getMinY(), bounds.getMaxY()); - ofCircle(screenX, screenY, 4); + ofDrawCircle(screenX, screenY, 4); } } } diff --git a/src/ofxTLFlags.cpp b/src/ofxTLFlags.cpp index 7ebe56de..104f8055 100644 --- a/src/ofxTLFlags.cpp +++ b/src/ofxTLFlags.cpp @@ -61,7 +61,7 @@ void ofxTLFlags::draw(){ int textHeight = bounds.y + 10 + ( (20*i) % int(MAX(bounds.height-15, 15))); key->display = ofRectangle(MIN(screenX+3, bounds.getMaxX() - key->textField.bounds.width), textHeight-10, 100, 15); - ofRect(key->display); + ofDrawRectangle(key->display); ofSetColor(timeline->getColors().textColor); diff --git a/src/ofxTLInOut.cpp b/src/ofxTLInOut.cpp index edef5b92..84d8ab99 100644 --- a/src/ofxTLInOut.cpp +++ b/src/ofxTLInOut.cpp @@ -59,7 +59,7 @@ void ofxTLInOut::draw(){ else{ ofSetColor(timeline->getColors().keyColor); } - ofLine(inScreenX, bounds.y, inScreenX, bounds.y+bounds.height); + ofDrawLine(inScreenX, bounds.y, inScreenX, bounds.y+bounds.height); } if(screenXRange.contains(outScreenX)){ @@ -69,7 +69,7 @@ void ofxTLInOut::draw(){ else{ ofSetColor(timeline->getColors().keyColor); } - ofLine(outScreenX, bounds.y, outScreenX, bounds.y+bounds.height); + ofDrawLine(outScreenX, bounds.y, outScreenX, bounds.y+bounds.height); } } @@ -82,16 +82,16 @@ void ofxTLInOut::draw(){ if(bounds.x < inPointX){ ofSetColor(timeline->getColors().disabledColor,120); - ofRect(bounds.x, pageRect.y, inPointX - bounds.x, pageRect.height); + ofDrawRectangle(bounds.x, pageRect.y, inPointX - bounds.x, pageRect.height); ofSetColor(timeline->getColors().highlightColor); - ofLine(inPointX, pageRect.y, inPointX, pageRect.y+pageRect.height); + ofDrawLine(inPointX, pageRect.y, inPointX, pageRect.y+pageRect.height); } if(bounds.x+bounds.width > outPointX){ ofSetColor(timeline->getColors().disabledColor,120); - ofRect(outPointX, pageRect.y, (bounds.x+bounds.width) - outPointX, pageRect.height); + ofDrawRectangle(outPointX, pageRect.y, (bounds.x+bounds.width) - outPointX, pageRect.height); ofSetColor(timeline->getColors().highlightColor); - ofLine(outPointX, pageRect.y, outPointX, pageRect.y+pageRect.height); + ofDrawLine(outPointX, pageRect.y, outPointX, pageRect.y+pageRect.height); } ofPopStyle(); diff --git a/src/ofxTLKeyframes.cpp b/src/ofxTLKeyframes.cpp index bc067bd6..0908b4e8 100755 --- a/src/ofxTLKeyframes.cpp +++ b/src/ofxTLKeyframes.cpp @@ -127,7 +127,7 @@ void ofxTLKeyframes::draw(){ ofFill(); ofSetColor(timeline->getColors().highlightColor); ofVec2f hoverKeyPoint = screenPositionForKeyframe( hoverKeyframe ); - ofCircle(hoverKeyPoint.x, hoverKeyPoint.y, 6); + ofDrawCircle(hoverKeyPoint, 6); ofPopStyle(); } @@ -135,7 +135,7 @@ void ofxTLKeyframes::draw(){ ofSetColor(timeline->getColors().textColor); ofNoFill(); for(int i = 0; i < keyPoints.size(); i++){ - ofRect(keyPoints[i].x-1, keyPoints[i].y-1, 3, 3); + ofDrawRectangle(keyPoints[i].x-1, keyPoints[i].y-1, 3, 3); } //**** SELECTED KEYS @@ -149,7 +149,7 @@ void ofxTLKeyframes::draw(){ string frameString = timeline->formatTime(selectedKeyframes[i]->time); timeline->getFont().drawString(ofToString(keysValue, 4), screenpoint.x+5, screenpoint.y-5); } - ofCircle(screenpoint.x, screenpoint.y, 4); + ofDrawCircle(screenpoint, 4); } } diff --git a/src/ofxTLLFO.cpp b/src/ofxTLLFO.cpp index 1cc4a32c..925cf247 100644 --- a/src/ofxTLLFO.cpp +++ b/src/ofxTLLFO.cpp @@ -58,51 +58,51 @@ void ofxTLLFO::drawModalContent(){ ofSetLineWidth(1); ofFill(); - ofRect(sineTypeRect); - ofRect(noiseTypeRect); - ofRect(phaseShiftRect); -// ofRect(phaseMatchRect); - ofRect(amplitudeRect); - ofRect(frequencyRect); - ofRect(seedRect); - ofRect(centerRect); - ofRect(interpolateRect); - ofRect(expInterpolateRect); + ofDrawRectangle(sineTypeRect); + ofDrawRectangle(noiseTypeRect); + ofDrawRectangle(phaseShiftRect); +// ofDrawRectangle(phaseMatchRect); + ofDrawRectangle(amplitudeRect); + ofDrawRectangle(frequencyRect); + ofDrawRectangle(seedRect); + ofDrawRectangle(centerRect); + ofDrawRectangle(interpolateRect); + ofDrawRectangle(expInterpolateRect); ofNoFill(); ofSetColor(timeline->getColors().keyColor); - ofRect(sineTypeRect); - ofRect(noiseTypeRect); - ofRect(phaseShiftRect); -// ofRect(phaseMatchRect); - ofRect(amplitudeRect); - ofRect(frequencyRect); - ofRect(seedRect); - ofRect(centerRect); - ofRect(interpolateRect); - ofRect(expInterpolateRect); + ofDrawRectangle(sineTypeRect); + ofDrawRectangle(noiseTypeRect); + ofDrawRectangle(phaseShiftRect); +// ofDrawRectangle(phaseMatchRect); + ofDrawRectangle(amplitudeRect); + ofDrawRectangle(frequencyRect); + ofDrawRectangle(seedRect); + ofDrawRectangle(centerRect); + ofDrawRectangle(interpolateRect); + ofDrawRectangle(expInterpolateRect); ofxTLLFOKey* lfokey = (ofxTLLFOKey*)selectedKeyframe; ofSetColor(timeline->getColors().highlightColor, 128); ofFill(); if(lfokey->type == OFXTL_LFO_TYPE_SINE){ - ofRect(sineTypeRect); + ofDrawRectangle(sineTypeRect); } else{ - ofRect(noiseTypeRect); + ofDrawRectangle(noiseTypeRect); } //TODO: Phase match // if(lfokey->phaseMatch){ -// ofRect(phaseMatchRect); +// ofDrawRectangle(phaseMatchRect); // } if(lfokey->interpolate){ - ofRect(interpolateRect); + ofDrawRectangle(interpolateRect); } if (lfokey->expInterpolate){ - ofRect(expInterpolateRect); + ofDrawRectangle(expInterpolateRect); } @@ -140,7 +140,7 @@ void ofxTLLFO::draw(){ ofSetColor(timeline->getColors().disabledColor, 30); float currentPercent = sampleAtTime(currentTrackTime()); ofFill(); - ofRect(bounds.x, bounds.getMaxY(), bounds.width, -bounds.height*currentPercent); + ofDrawRectangle(bounds.x, bounds.getMaxY(), bounds.width, -bounds.height*currentPercent); ofPushStyle(); ofSetColor(timeline->getColors().keyColor); @@ -167,7 +167,7 @@ void ofxTLLFO::draw(){ ofSetColor(timeline->getColors().keyColor); } float screenX = millisToScreenX(keyframes[i]->time); - ofLine(screenX, bounds.y, screenX, bounds.y+bounds.height); + ofDrawLine(screenX, bounds.y, screenX, bounds.y+bounds.height); } } diff --git a/src/ofxTLPage.cpp b/src/ofxTLPage.cpp index 9b728199..7b0e04a2 100644 --- a/src/ofxTLPage.cpp +++ b/src/ofxTLPage.cpp @@ -131,8 +131,8 @@ void ofxTLPage::draw(){ set::iterator it; // for(int i = 0; i < snapPoints.size(); i++){ for(it = snapPoints.begin(); it != snapPoints.end(); it++){ - ofLine(timeline->millisToScreenX(*it), trackContainerRect.y, - timeline->millisToScreenX(*it), trackContainerRect.y+trackContainerRect.height); + ofDrawLine(timeline->millisToScreenX(*it), trackContainerRect.y, + timeline->millisToScreenX(*it), trackContainerRect.y+trackContainerRect.height); } ofPopStyle(); } @@ -144,11 +144,11 @@ void ofxTLPage::draw(){ if(draggingSelectionRectangle){ ofFill(); ofSetColor(timeline->getColors().keyColor, 30); - ofRect(selectionRectangle); + ofDrawRectangle(selectionRectangle); ofNoFill(); ofSetColor(timeline->getColors().keyColor, 255); - ofRect(selectionRectangle); + ofDrawRectangle(selectionRectangle); } } diff --git a/src/ofxTLPageTabs.cpp b/src/ofxTLPageTabs.cpp index b6c12841..1d8e2e86 100644 --- a/src/ofxTLPageTabs.cpp +++ b/src/ofxTLPageTabs.cpp @@ -44,12 +44,12 @@ void ofxTLPageTabs::draw(){ if(i == selectedPageIndex){ ofFill(); ofSetColor(timeline->getColors().highlightColor, 120); - ofRect(pages[i].bounds); + ofDrawRectangle(pages[i].bounds); } ofNoFill(); //ofSetColor(255, 100, 0); ofSetColor(timeline->getColors().outlineColor); - ofRect(pages[i].bounds); + ofDrawRectangle(pages[i].bounds); ofSetColor(timeline->getColors().textColor); timeline->getFont().drawString(pages[i].name, pages[i].bounds.x + 10, pages[i].bounds.y + timeline->getFont().getLineHeight()); } diff --git a/src/ofxTLSwitches.cpp b/src/ofxTLSwitches.cpp index e3d8a049..358415af 100644 --- a/src/ofxTLSwitches.cpp +++ b/src/ofxTLSwitches.cpp @@ -90,7 +90,7 @@ void ofxTLSwitches::draw(){ //play solo change if(isOn()){ ofSetColor(timeline->getColors().disabledColor, 20+(1-powf(sin(ofGetElapsedTimef()*5)*.5+.5,2))*20); - ofRect(bounds); + ofDrawRectangle(bounds); } for(int i = 0; i < keyframes.size(); i++){ @@ -113,8 +113,8 @@ void ofxTLSwitches::draw(){ ofSetColor(timeline->getColors().keyColor); } - ofLine(switchKey->display.x, bounds.y, - switchKey->display.x, bounds.y+bounds.height); + ofDrawLine(switchKey->display.x, bounds.y, + switchKey->display.x, bounds.y+bounds.height); if(keyIsSelected || switchKey->endSelected){ ofSetColor(timeline->getColors().textColor); @@ -122,8 +122,8 @@ void ofxTLSwitches::draw(){ else{ ofSetColor(timeline->getColors().keyColor); } - ofLine(switchKey->display.x+switchKey->display.width, bounds.y, - switchKey->display.x+switchKey->display.width, bounds.y+bounds.height); + ofDrawLine(switchKey->display.x+switchKey->display.width, bounds.y, + switchKey->display.x+switchKey->display.width, bounds.y+bounds.height); //draw region if(keyIsSelected){ @@ -142,7 +142,7 @@ void ofxTLSwitches::draw(){ else{ ofSetColor(timeline->getColors().keyColor); } - ofRect(switchKey->display.x-2, bounds.y, 4, bounds.height); + ofDrawRectangle(switchKey->display.x-2, bounds.y, 4, bounds.height); ofPopStyle(); } else if(endHover){ @@ -153,7 +153,7 @@ void ofxTLSwitches::draw(){ else{ ofSetColor(timeline->getColors().keyColor); } - ofRect(switchKey->display.x+switchKey->display.width-2, bounds.y, 4.0, bounds.height); + ofDrawRectangle(switchKey->display.x+switchKey->display.width-2, bounds.y, 4.0, bounds.height); ofPopStyle(); } else { @@ -164,7 +164,7 @@ void ofxTLSwitches::draw(){ } } } - ofRect(switchKey->display); + ofDrawRectangle(switchKey->display); } ofFill(); @@ -178,7 +178,7 @@ void ofxTLSwitches::draw(){ int textHeight = bounds.y + 10 + ( (20*i) % int(MAX(bounds.height-15, 15))); switchKey->textFieldDisplay = ofRectangle(MIN(screenX+3, bounds.getMaxX() - switchKey->textField.bounds.width), textHeight-10, 100, 15); - ofRect(switchKey->textFieldDisplay); + ofDrawRectangle(switchKey->textFieldDisplay); ofSetColor(timeline->getColors().textColor); diff --git a/src/ofxTLTicker.cpp b/src/ofxTLTicker.cpp index ced9b55f..4d92f356 100644 --- a/src/ofxTLTicker.cpp +++ b/src/ofxTLTicker.cpp @@ -77,7 +77,7 @@ void ofxTLTicker::draw(){ ofSetColor(255, 255, 255, 50); for(int i = 0; i < bpmScreenPoints.size(); i++){ ofSetLineWidth(bpmScreenPoints[i].weight); - ofLine(bpmScreenPoints[i].screenX, getBottomEdge(), bpmScreenPoints[i].screenX, totalDrawRect.y+totalDrawRect.height); + ofDrawLine(bpmScreenPoints[i].screenX, getBottomEdge(), bpmScreenPoints[i].screenX, totalDrawRect.y+totalDrawRect.height); } ofPopStyle(); } @@ -103,7 +103,7 @@ void ofxTLTicker::draw(){ } previewTimecodeX = ofClamp(screenX+5, bounds.getMinX(), bounds.getMaxX()-textW-5); ofFill(); - ofRect(previewTimecodeX-5, bounds.y+textH, textW, textH); + ofDrawRectangle(previewTimecodeX-5, bounds.y+textH, textW, textH); //draw playhead line ofSetColor(timeline->getColors().textColor); timeline->getFont().drawString(text, previewTimecodeX, bounds.y+textH*2); @@ -112,7 +112,7 @@ void ofxTLTicker::draw(){ ofSetColor(timeline->getColors().highlightColor); ofSetLineWidth(1); - ofLine(screenX, totalDrawRect.y, screenX, totalDrawRect.y+totalDrawRect.height); + ofDrawLine(screenX, totalDrawRect.y, screenX, totalDrawRect.y+totalDrawRect.height); } //draw current frame @@ -131,7 +131,7 @@ void ofxTLTicker::draw(){ int timeCodeX = ofClamp(currentFrameX+5, bounds.getMinX(), bounds.getMaxX()-textW-5); ofSetColor(timeline->getColors().backgroundColor); ofFill(); - ofRect(timeCodeX-5, bounds.y, textW, textH); + ofDrawRectangle(timeCodeX-5, bounds.y, textW, textH); ofSetColor(timeline->getColors().textColor); timeline->getFont().drawString(text, timeCodeX, bounds.y+textH); } @@ -145,11 +145,11 @@ void ofxTLTicker::draw(){ //draw playhead line ofSetLineWidth(1); - ofLine(currentFrameX, totalDrawRect.y, currentFrameX, totalDrawRect.y+totalDrawRect.height); + ofDrawLine(currentFrameX, totalDrawRect.y, currentFrameX, totalDrawRect.y+totalDrawRect.height); //draw bounds ofNoFill(); ofSetColor(200, 180, 40); - ofRect(bounds); + ofDrawRectangle(bounds); ofPopStyle(); } diff --git a/src/ofxTLTrack.cpp b/src/ofxTLTrack.cpp index 710141c8..2edfc1d8 100644 --- a/src/ofxTLTrack.cpp +++ b/src/ofxTLTrack.cpp @@ -120,7 +120,7 @@ void ofxTLTrack::_draw(){ if(focused){ ofFill(); ofSetColor(timeline->getColors().highlightColor, 50); - ofRect(bounds.x, bounds.y, bounds.width, bounds.height); + ofDrawRectangle(bounds.x, bounds.y, bounds.width, bounds.height); } ofNoFill(); @@ -130,7 +130,7 @@ void ofxTLTrack::_draw(){ else{ ofSetColor(timeline->getColors().outlineColor); } - ofRect(bounds.x, bounds.y, bounds.width, bounds.height); + ofDrawRectangle(bounds.x, bounds.y, bounds.width, bounds.height); ofPopStyle(); ofPushStyle(); @@ -142,7 +142,7 @@ void ofxTLTrack::_draw(){ if(isOnScreen(playheadScreenX)){ ofPushStyle(); ofSetColor(timeline->getColors().keyColor); - ofLine(playheadScreenX, bounds.getMinY(), playheadScreenX, bounds.getMaxY()); + ofDrawLine(playheadScreenX, bounds.getMinY(), playheadScreenX, bounds.getMaxY()); ofPopStyle(); } } diff --git a/src/ofxTLTrackHeader.cpp b/src/ofxTLTrackHeader.cpp index 4b1b42a4..5eb94eef 100644 --- a/src/ofxTLTrackHeader.cpp +++ b/src/ofxTLTrackHeader.cpp @@ -103,7 +103,7 @@ void ofxTLTrackHeader::draw(){ if(track->hasFocus()){ ofFill(); ofSetColor(timeline->getColors().highlightColor, 50); - ofRect(bounds.x, bounds.y, bounds.width, bounds.height); + ofDrawRectangle(bounds.x, bounds.y, bounds.width, bounds.height); } // TODO: set these somewhere else instead of setting it every frame here @@ -140,7 +140,7 @@ void ofxTLTrackHeader::draw(){ } ofSetColor(track->getTimeline()->getColors().outlineColor); - ofRect(bounds); + ofDrawRectangle(bounds); //draw grippy lines on the footer draggable element if(footerHeight > 0){ diff --git a/src/ofxTLVideoTrack.cpp b/src/ofxTLVideoTrack.cpp index ed1ed7a1..b4c42a41 100755 --- a/src/ofxTLVideoTrack.cpp +++ b/src/ofxTLVideoTrack.cpp @@ -394,7 +394,7 @@ void ofxTLVideoTrack::draw(){ else{ ofPushStyle(); ofSetColor(0); - ofRect(videoThumbs[i].displayRect); + ofDrawRectangle(videoThumbs[i].displayRect); ofPopStyle(); } } @@ -405,13 +405,13 @@ void ofxTLVideoTrack::draw(){ if (!thumbsEnabled) { ofFill(); ofSetColor(0); - ofRect(videoThumbs[i].displayRect); + ofDrawRectangle(videoThumbs[i].displayRect); } ofNoFill(); ofSetColor(timeline->getColors().textColor); timeline->getFont().drawString(ofToString(videoThumbs[i].framenum), videoThumbs[i].displayRect.x+5, videoThumbs[i].displayRect.y+15); - ofRect(videoThumbs[i].displayRect); + ofDrawRectangle(videoThumbs[i].displayRect); } if(drawVideoPreview){ @@ -423,13 +423,13 @@ void ofxTLVideoTrack::draw(){ ofPushStyle(); ofFill(); ofSetColor(timeline->getColors().backgroundColor, 100); - ofRect(selectedFrameX + 1, bounds.y + 1, previewRect.width - 2, bounds.height - 2); + ofDrawRectangle(selectedFrameX + 1, bounds.y + 1, previewRect.width - 2, bounds.height - 2); ofPopStyle(); } } ofSetColor(timeline->getColors().textColor); - ofLine(selectedFrameX, bounds.y, selectedFrameX, bounds.y+bounds.height); + ofDrawLine(selectedFrameX, bounds.y, selectedFrameX, bounds.y+bounds.height); timeline->getFont().drawString("F# " + ofToString(selectedFrame), selectedFrameX, bounds.y+15); timeline->getFont().drawString(ofxTimecode::timecodeForSeconds(player->getPosition()*player->getDuration()), selectedFrameX, bounds.y+30); @@ -438,8 +438,8 @@ void ofxTLVideoTrack::draw(){ ofSetColor(timeline->getColors().highlightColor); int inFrameX = screenXForTime( timeline->getTimecode().secondsForFrame(inFrame)); int outFrameX = screenXForTime( timeline->getTimecode().secondsForFrame(outFrame)); - ofLine(inFrameX, bounds.y, inFrameX, bounds.y+bounds.height); - ofLine(outFrameX, bounds.y, outFrameX, bounds.y+bounds.height); + ofDrawLine(inFrameX, bounds.y, inFrameX, bounds.y+bounds.height); + ofDrawLine(outFrameX, bounds.y, outFrameX, bounds.y+bounds.height); ofSetColor(timeline->getColors().textColor); timeline->getFont().drawString("in " + ofToString(inFrame), inFrameX + 5, bounds.y + 10); timeline->getFont().drawString("out " + ofToString(outFrame), outFrameX + 5, bounds.y + bounds.height - 20); diff --git a/src/ofxTLZoomer.cpp b/src/ofxTLZoomer.cpp index 1e39d270..4c2b833a 100755 --- a/src/ofxTLZoomer.cpp +++ b/src/ofxTLZoomer.cpp @@ -65,7 +65,7 @@ void ofxTLZoomer::draw(){ ofSetLineWidth(1); } - ofLine(minScreenX, screenY, maxScreenX, screenY); + ofDrawLine(minScreenX, screenY, maxScreenX, screenY); ofSetLineWidth(1); if(minSelected){ @@ -74,7 +74,7 @@ void ofxTLZoomer::draw(){ else{ ofNoFill(); } - ofCircle(minScreenX, screenY, 5); + ofDrawCircle(minScreenX, screenY, 5); if(maxSelected){ ofFill(); @@ -82,12 +82,12 @@ void ofxTLZoomer::draw(){ else{ ofNoFill(); } - ofCircle(maxScreenX, screenY, 5); + ofDrawCircle(maxScreenX, screenY, 5); // cout << "zoomer bounds width " << bounds.width << endl; //draw playhead reference - ofLine(bounds.x+bounds.width*timeline->getPercentComplete(), bounds.y, - bounds.x+bounds.width*timeline->getPercentComplete(), bounds.y+bounds.height); + ofDrawLine(bounds.x+bounds.width*timeline->getPercentComplete(), bounds.y, + bounds.x+bounds.width*timeline->getPercentComplete(), bounds.y+bounds.height); //draw zoom region reference ofSetColor(timeline->getColors().backgroundColor); ofRange actualZoom = getViewRange(); @@ -95,7 +95,7 @@ void ofxTLZoomer::draw(){ bounds.width*actualZoom.span(),bounds.height); ofFill(); ofSetColor(timeline->getColors().keyColor, 50); - ofRect(zoomRegion); + ofDrawRectangle(zoomRegion); ofPopStyle(); } diff --git a/src/ofxTimeline.cpp b/src/ofxTimeline.cpp index c8f434eb..f0a4c86c 100755 --- a/src/ofxTimeline.cpp +++ b/src/ofxTimeline.cpp @@ -892,12 +892,6 @@ void ofxTimeline::setDurationInFrames(int frames){ void ofxTimeline::setDurationInSeconds(float seconds){ - bool updateInTime = inoutRange.min > 0.; - bool updateOutTime = inoutRange.max < 1.; - - float inTimeSeconds = getInTimeInSeconds(); - float outTimeSeconds = getOutTimeInSeconds(); - if(seconds <= 0.){ ofLogError("ofxTimeline::setDurationInSeconds") << " Duration must set a positive number"; return; @@ -905,6 +899,11 @@ void ofxTimeline::setDurationInSeconds(float seconds){ //verify no elements are being truncated durationInSeconds = MAX(seconds, getLatestTime()/1000.0); + bool updateInTime = inoutRange.min > 0.; + bool updateOutTime = inoutRange.max < 1.; + + float inTimeSeconds = getInTimeInSeconds(); + float outTimeSeconds = getOutTimeInSeconds(); if(updateInTime){ setInPointAtSeconds(inTimeSeconds); @@ -1550,7 +1549,7 @@ void ofxTimeline::draw(){ ofEnableAlphaBlending(); ofSetColor(colors.guiBackgroundColor); - ofRect(totalDrawRect); + ofDrawRectangle(totalDrawRect); ofSetColor(255);