merge to master

Author: d3cod3

README.md

@@ -26,8 +26,14 @@ common:
 	# or use += in several lines
         ADDON_DEPENDENCIES = ofxAssimpModelLoader ofxGui ofxKinect ofxNetwork ofxOpenCv ofxOsc ofxSvg ofxVectorGraphics ofxXmlSettings
         ADDON_DEPENDENCIES += ofxAudioAnalyzer ofxAudioFile ofxBTrack ofxChromaKeyShader ofxCv ofxEasing ofxFFmpegRecorder ofxFontStash ofxGLEditor
+<<<<<<< HEAD
+        ADDON_DEPENDENCIES += ofxJSON ofxInfiniteCanvas ofxLua ofxMidi ofxMtlMapping2D
+        ADDON_DEPENDENCIES += ofxPDSP ofxTimeline ofxWarp
+        ADDON_DEPENDENCIES += ofxImGui
+=======
         ADDON_DEPENDENCIES += ofxDatGui ofxHistoryPlot ofxJSON ofxInfiniteCanvas ofxLua ofxMidi ofxMtlMapping2D ofxParagraph
         ADDON_DEPENDENCIES += ofxPDSP ofxThreadedFileDialog ofxTimeline ofxTimeMeasurements ofxWarp
+>>>>>>> master
 
 	# include search paths, this will be usually parsed from the file system
 	# but if the addon or addon libraries need special search paths they can be
@@ -72,10 +78,20 @@ common:
 	# ADDON_INCLUDES_EXCLUDE =
 
 linux64:
+<<<<<<< HEAD
+        ADDON_DEPENDENCIES += ofxPd ofxPdExternals ofxPython ofxNDI
+
+msys2:
+        ADDON_SOURCES_EXCLUDE = src/objects/scripting/BashScript% src/objects/scripting/PythonScript% src/objects/sound/PDPatch% src/objects/video/VideoSender% src/objects/video/VideoReceiver%
+
+osx:
+        ADDON_DEPENDENCIES += ofxPd ofxPdExternals ofxPython ofxNDI
+=======
         ADDON_DEPENDENCIES += ofxJava ofxPd ofxPdExternals ofxPython ofxNDI
 
 msys2:
         ADDON_SOURCES_EXCLUDE = src/objects/scripting/BashScript% src/objects/scripting/ProcessingScript% src/objects/scripting/PythonScript% src/objects/sound/PDPatch% src/objects/video/VideoSender% src/objects/video/VideoReceiver%
 
 osx:
         ADDON_DEPENDENCIES += ofxJava ofxPd ofxPdExternals ofxPython ofxNDI
+>>>>>>> master

addon_config.mk

@@ -0,0 +1,13 @@
+# Attempt to load a config.make file.
+# If none is found, project defaults in config.project.make will be used.
+ifneq ($(wildcard config.make),)
+	include config.make
+endif
+
+# make sure the the OF_ROOT location is defined
+ifndef OF_ROOT
+	OF_ROOT=$(realpath ../../..)
+endif
+
+# call the project makefile!
+include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk

example_ImGui/Makefile

@@ -0,0 +1,2 @@
+ofxImGui
+ofxVisualProgramming

example_ImGui/addons.make

@@ -0,0 +1 @@
+APPL????

example_ImGui/bin/PkgInfo

@@ -0,0 +1,20 @@
+keyPressed()=1|1|0
+Nested Test L2=1|1|0
+some uncommon method=1|1|0
+sample across frames=1|1|0
+GL_drawDotsGL=1|1|0
+keyDown=1|1|0
+draw()=1|1|0
+nested measurement12=0|1|0
+scope measurement=1|1|0
+T1:subtask1=1|1|0
+accum test=1|1|0
+scope measurement acc=1|1|0
+nested measurement111=0|1|0
+T1:task=1|1|0
+nested measurement11=0|1|0
+simple measurement=1|1|0
+setup()=1|1|0
+nested measurement1=1|1|0
+draw dots=1|1|0
+update()=1|1|0

example_ImGui/bin/data/.gitkeep

@@ -0,0 +1,13 @@
+<github>https://github.com/d3cod3/mosaic</github>
+<www>https://mosaic.d3cod3.org</www>
+<settings>
+    <output_width>1280</output_width>
+    <output_height>720</output_height>
+    <audio_in_device>0</audio_in_device>
+    <audio_out_device>0</audio_out_device>
+    <sample_rate_in>44100</sample_rate_in>
+    <sample_rate_out>44100</sample_rate_out>
+    <buffer_size>256</buffer_size>
+    <input_channels>0</input_channels>
+    <output_channels>0</output_channels>
+</settings>

example_ImGui/bin/data/configs/ofxTimeMeasurements.settings

@@ -0,0 +1,45 @@
+# IBM Plex Typeface
+
+Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.