diff --git a/THANKS.md b/THANKS.md new file mode 100644 index 00000000000..8e9b364086c --- /dev/null +++ b/THANKS.md @@ -0,0 +1,36 @@ +``` + .----. .---. .----. .---. + / .. \ /_ | / .. \ /_ | +. / \ . | |. / \ . | | +| | ' | | || | ' | | | +' \ / ' | |' \ / ' | | + \ `' / .-. | | \ `' / .-. | | + `---'' `-' `---' `---'' `-' `---' +``` + +- Arnaud Loonstra +- arturo castro +- Christopher Baker +- Daniel Rosser +- Dan Wilcox +- Davide Prati +- d-egan +- Hiroshi Matoba +- ISHII 2bit +- ivorne +- Jason Van Cleave +- jpericas22 +- Kyle Kirby +- Leonardo Zimmerman +- lilive +- Mike Allison +- Nicola Pisanti +- ofTheo +- Pascal Baltazar +- Patricio Gonzalez Vivo +- Roy Macdonald +- Seb Lee-Delisle +- Tim Gfrerer +- Yusuke Tomoto +- なりたけいすけ + diff --git a/libs/openFrameworks/types/ofParameter.h b/libs/openFrameworks/types/ofParameter.h index 9e36af034f2..1d19927d649 100644 --- a/libs/openFrameworks/types/ofParameter.h +++ b/libs/openFrameworks/types/ofParameter.h @@ -483,7 +483,9 @@ class ofParameter: public ofAbstractParameter{ ofParameter(const ofParameter & v); ofParameter(const ParameterType & v); ofParameter(const std::string& name, const ParameterType & v); + ofParameter(const std::string& name, const ParameterType & v, bool serializable); ofParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max); + ofParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable); const ParameterType & get() const; const ParameterType * operator->() const; @@ -557,6 +559,7 @@ class ofParameter: public ofAbstractParameter{ ofParameter & set(const ParameterType & v); ofParameter & set(const std::string& name, const ParameterType & v); ofParameter & set(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max); + ofParameter & set(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable); ofParameter & setWithoutEventNotifications(const ParameterType & v); @@ -608,6 +611,14 @@ class ofParameter: public ofAbstractParameter{ ,bInNotify(false) ,serializable(true){} + Value(std::string name, ParameterType v, bool serializable) + :name(name) + ,value(v) + ,min(of::priv::TypeInfo::min()) + ,max(of::priv::TypeInfo::max()) + ,bInNotify(false) + ,serializable(serializable){} + Value(std::string name, ParameterType v, ParameterType min, ParameterType max) :name(name) ,value(v) @@ -616,6 +627,14 @@ class ofParameter: public ofAbstractParameter{ ,bInNotify(false) ,serializable(true){} + Value(std::string name, ParameterType v, ParameterType min, ParameterType max, bool serializable) + :name(name) + ,value(v) + ,min(min) + ,max(max) + ,bInNotify(false) + ,serializable(serializable){} + std::string name; ParameterType value; ParameterType min, max; @@ -656,11 +675,20 @@ ofParameter::ofParameter(const std::string& name, const Parameter :obj(std::make_shared(name, v)) ,setMethod(std::bind(&ofParameter::eventsSetValue, this, std::placeholders::_1)){} +template +ofParameter::ofParameter(const std::string& name, const ParameterType & v, bool serializable) +:obj(std::make_shared(name, v, serializable)) +,setMethod(std::bind(&ofParameter::eventsSetValue, this, std::placeholders::_1)){} + template ofParameter::ofParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max) :obj(std::make_shared(name, v, min, max)) ,setMethod(std::bind(&ofParameter::eventsSetValue, this, std::placeholders::_1)){} +template +ofParameter::ofParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable) +:obj(std::make_shared(name, v, min, max, serializable)) +,setMethod(std::bind(&ofParameter::eventsSetValue, this, std::placeholders::_1)){} template inline ofParameter & ofParameter::operator=(const ofParameter & v){ @@ -689,6 +717,16 @@ ofParameter & ofParameter::set(const std::string& return *this; } +template +ofParameter & ofParameter::set(const std::string& name, const ParameterType & value, const ParameterType & min, const ParameterType & max, bool serializable){ + setName(name); + set(value); + setMin(min); + setMax(max); + setSerializable(serializable); + return *this; +} + template ofParameter & ofParameter::set(const std::string& name, const ParameterType & value){ setName(name); @@ -1077,7 +1115,9 @@ class ofReadOnlyParameter: public ofAbstractParameter{ // ofReadOnlyParameter(ofReadOnlyParameter & p); ofReadOnlyParameter(const ParameterType & v); ofReadOnlyParameter(const std::string& name, const ParameterType & v); + ofReadOnlyParameter(const std::string& name, const ParameterType & v, bool serializable); ofReadOnlyParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max); + ofReadOnlyParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable); const ParameterType & get() const; const ParameterType * operator->() const; @@ -1152,6 +1192,7 @@ class ofReadOnlyParameter: public ofAbstractParameter{ ofReadOnlyParameter& set(const std::string& name, const ParameterType & value); ofReadOnlyParameter& set(const std::string& name, const ParameterType & value, const ParameterType & min, const ParameterType & max); + ofReadOnlyParameter& set(const std::string& name, const ParameterType & value, const ParameterType & min, const ParameterType & max, bool serializable); void setMin(const ParameterType & min); void setMax(const ParameterType & max); @@ -1198,10 +1239,17 @@ template inline ofReadOnlyParameter::ofReadOnlyParameter(const std::string& name, const ParameterType & v) :parameter(name,v){} +template +inline ofReadOnlyParameter::ofReadOnlyParameter(const std::string& name, const ParameterType & v, bool serializable) +:parameter(name,v, serializable){} + template inline ofReadOnlyParameter::ofReadOnlyParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max) :parameter(name,v,min,max){} +template +inline ofReadOnlyParameter::ofReadOnlyParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable) +:parameter(name,v,min,max,serializable){} template inline const ParameterType & ofReadOnlyParameter::get() const{ @@ -1440,6 +1488,11 @@ inline ofReadOnlyParameter & ofReadOnlyParameter +inline ofReadOnlyParameter & ofReadOnlyParameter::set(const std::string& name, const ParameterType & value, const ParameterType & min, const ParameterType & max, bool serializable){ + parameter.set(name,value,min,max,serializable); + return *this; +} template inline void ofReadOnlyParameter::setMin(const ParameterType & min){ diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h index 88882befaa9..d27b3892d03 100644 --- a/libs/openFrameworks/utils/ofConstants.h +++ b/libs/openFrameworks/utils/ofConstants.h @@ -3,9 +3,9 @@ //------------------------------- #define OF_VERSION_MAJOR 0 -#define OF_VERSION_MINOR 10 -#define OF_VERSION_PATCH 1 -#define OF_VERSION_PRE_RELEASE "stable" +#define OF_VERSION_MINOR 11 +#define OF_VERSION_PATCH 0 +#define OF_VERSION_PRE_RELEASE "master" // Set to 1 for compatibility with old projects using ofVec instead of glm #ifndef OF_USE_LEGACY_VECTOR_MATH @@ -124,7 +124,7 @@ enum ofTargetPlatform{ #define GLEW_STATIC #define GLEW_NO_GLU #include "GL/glew.h" - #include "GL/wglew.h" + #include "GL/wglew.h" #define __WINDOWS_DS__ #define __WINDOWS_MM__ #if (_MSC_VER) // microsoft visual studio @@ -177,6 +177,7 @@ enum ofTargetPlatform{ #endif #include #include "GL/glew.h" + #include #include #if defined(__LITTLE_ENDIAN__) @@ -204,8 +205,11 @@ enum ofTargetPlatform{ #define EGL_EGLEXT_PROTOTYPES #include "EGL/egl.h" #include "EGL/eglext.h" - #else // desktop linux - #include + #else // normal linux + #define GL_GLEXT_PROTOTYPES + #include + #include + #include #endif // for some reason, this isn't defined at compile time, diff --git a/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk b/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk index c0dfbd0b831..a1f8a632b3f 100644 --- a/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk @@ -3,13 +3,13 @@ # define the OF_SHARED_MAKEFILES location OF_SHARED_MAKEFILES_PATH=$(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon -include $(OF_SHARED_MAKEFILES_PATH)/config.shared.mk - # if APPNAME is not defined, set it to the project dir name ifndef APPNAME APPNAME = $(shell basename `pwd`) endif +include $(OF_SHARED_MAKEFILES_PATH)/config.shared.mk + # Name TARGET ifeq ($(findstring Debug,$(MAKECMDGOALS)),Debug) TARGET_NAME = Debug diff --git a/scripts/dev/changelog.sh b/scripts/dev/changelog.sh new file mode 100755 index 00000000000..29e8c5d9245 --- /dev/null +++ b/scripts/dev/changelog.sh @@ -0,0 +1,5 @@ +if [ $# -ne 2 ]; then + echo Error: wrong number of arguments + echo Usage: ./thanks.sh tag1 tag2 +fi +git log $1...$2 --no-merges --pretty=format:'- %s [commit](https://github.com/openframeworks/openFrameworks/commit/%H)' --reverse | sed 's/^\s*[0-9][0-9]*\s\(.*\)$/- \1/g' \ No newline at end of file diff --git a/scripts/dev/create_package.sh b/scripts/dev/create_package.sh index 91870a14e36..c0af59ae8f9 100755 --- a/scripts/dev/create_package.sh +++ b/scripts/dev/create_package.sh @@ -24,7 +24,7 @@ else libs_abi="" fi -REPO=../.. +REPO=https://github.com/openframeworks/openFrameworks.git REPO_ALIAS=originlocal BRANCH=$branch diff --git a/scripts/dev/thanks.sh b/scripts/dev/thanks.sh new file mode 100755 index 00000000000..8df89d2529a --- /dev/null +++ b/scripts/dev/thanks.sh @@ -0,0 +1,5 @@ +if [ $# -ne 2 ]; then + echo Error: wrong number of arguments + echo Usage: ./thanks.sh tag1 tag2 +fi +git log $1...$2 --no-merges "$@" | grep ^Author: | sed 's/ <.*//; s/^Author: //' | sort | uniq -c | sed 's/\s*[0-9][0-9]*\(.*\)/-\1/g'