Add useful ofParameter constructor

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
+- なりたけいすけ
+

libs/openFrameworks/types/ofParameter.h

@@ -483,7 +483,9 @@ class ofParameter: public ofAbstractParameter{
 	ofParameter(const ofParameter<ParameterType> & 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<ParameterType> & set(const ParameterType & v);
 	ofParameter<ParameterType> & set(const std::string& name, const ParameterType & v);
 	ofParameter<ParameterType> & set(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max);
+    ofParameter<ParameterType> & set(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable);
 
 	ofParameter<ParameterType> & 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<ParameterType>::min())
+        ,max(of::priv::TypeInfo<ParameterType>::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<ParameterType>::ofParameter(const std::string& name, const Parameter
 :obj(std::make_shared<Value>(name, v))
 ,setMethod(std::bind(&ofParameter<ParameterType>::eventsSetValue, this, std::placeholders::_1)){}
 
+template<typename ParameterType>
+ofParameter<ParameterType>::ofParameter(const std::string& name, const ParameterType & v, bool serializable)
+:obj(std::make_shared<Value>(name, v, serializable))
+,setMethod(std::bind(&ofParameter<ParameterType>::eventsSetValue, this, std::placeholders::_1)){}
+
 template<typename ParameterType>
 ofParameter<ParameterType>::ofParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max)
 :obj(std::make_shared<Value>(name, v, min, max))
 ,setMethod(std::bind(&ofParameter<ParameterType>::eventsSetValue, this, std::placeholders::_1)){}
 
+template<typename ParameterType>
+ofParameter<ParameterType>::ofParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable)
+:obj(std::make_shared<Value>(name, v, min, max, serializable))
+,setMethod(std::bind(&ofParameter<ParameterType>::eventsSetValue, this, std::placeholders::_1)){}
 
 template<typename ParameterType>
 inline ofParameter<ParameterType> & ofParameter<ParameterType>::operator=(const ofParameter<ParameterType> & v){
@@ -689,6 +717,16 @@ ofParameter<ParameterType> & ofParameter<ParameterType>::set(const std::string&
 	return *this;
 }
 
+template<typename ParameterType>
+ofParameter<ParameterType> & ofParameter<ParameterType>::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<typename ParameterType>
 ofParameter<ParameterType> & ofParameter<ParameterType>::set(const std::string& name, const ParameterType & value){
 	setName(name);
@@ -1077,7 +1115,9 @@ class ofReadOnlyParameter: public ofAbstractParameter{
 //	ofReadOnlyParameter(ofReadOnlyParameter<ParameterType,Friend> & 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<ParameterType,Friend>& set(const std::string& name, const ParameterType & value);
 	ofReadOnlyParameter<ParameterType,Friend>& set(const std::string& name, const ParameterType & value, const ParameterType & min, const ParameterType & max);
+    ofReadOnlyParameter<ParameterType,Friend>& 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<typename ParameterType,typename Friend>
 inline ofReadOnlyParameter<ParameterType,Friend>::ofReadOnlyParameter(const std::string& name, const ParameterType & v)
 :parameter(name,v){}
 
+template<typename ParameterType,typename Friend>
+inline ofReadOnlyParameter<ParameterType,Friend>::ofReadOnlyParameter(const std::string& name, const ParameterType & v, bool serializable)
+:parameter(name,v, serializable){}
+
 template<typename ParameterType,typename Friend>
 inline ofReadOnlyParameter<ParameterType,Friend>::ofReadOnlyParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max)
 :parameter(name,v,min,max){}
 
+template<typename ParameterType,typename Friend>
+inline ofReadOnlyParameter<ParameterType,Friend>::ofReadOnlyParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable)
+:parameter(name,v,min,max,serializable){}
 
 template<typename ParameterType,typename Friend>
 inline const ParameterType & ofReadOnlyParameter<ParameterType,Friend>::get() const{
@@ -1440,6 +1488,11 @@ inline ofReadOnlyParameter<ParameterType,Friend> & ofReadOnlyParameter<Parameter
 	return *this;
 }
 
+template<typename ParameterType,typename Friend>
+inline ofReadOnlyParameter<ParameterType,Friend> & ofReadOnlyParameter<ParameterType,Friend>::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<typename ParameterType,typename Friend>
 inline void ofReadOnlyParameter<ParameterType,Friend>::setMin(const ParameterType & min){

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 <unistd.h>
 	#include "GL/glew.h"
+	#include <OpenGL/gl.h>
 	#include <ApplicationServices/ApplicationServices.h>
 
 	#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 <GL/glew.h> 
+	#else // normal linux
+		#define GL_GLEXT_PROTOTYPES
+		#include <GL/glew.h>
+		#include <GL/gl.h>
+		#include <GL/glext.h>
 	#endif
 
 	// for some reason, this isn't defined at compile time,

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

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'

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
 

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'