Merge branch 'master' of github.com:openframeworks/openFrameworks int…

…o Feature-VS2013

# By arturo (37) and others
# Via arturo (20) and others
* 'master' of github.com:openframeworks/openFrameworks: (80 commits)
  removed unused _ctext variable.
  ofxiOSKeybaord fix.
  removed unused clear()
  allow OSC message send without bundle wrapper, fixes openframeworks#1804
  remove glGetString that can return NULL
  updated TARGET_OF_IPHONE guard to TARGET_OF_IOS
  replaced TARGET_OF_IPHONE with TARGET_OF_IOS
  updated ofxiOS to use shared_ptr
  updated CHANGELOG
  ofGetCurrentNormalMatrix()
  updated changelog
  deprecate ofPtr
  breaklines
  change minor version to 3 in ofConstants.h
  0.8.3 changelog
  fixes for ofxKinect on win32 CodeBlocks Closes openframeworks#3062
  remove linux-only guard in drag-drop implementation Fixes openframeworks#3059
  create_package: fix syntax
  create_package: move addons exclusions along with other addons
  ofxAssimpModelLoader: fix animation timming. Closes openframeworks#3055
  ...

CHANGELOG.md

@@ -1,38 +1,112 @@
-OF 0.8.2
+OF 0.9.0
+========
+
+#### change key
+          + added
+          - removed
+          / modified
+
+------------------------------------------------------------------------------
+
+CORE
+----
+### gl
+	+ Programmable lights and materials
+	+ New area light type on programmable renderer
+	+ Separate model matrix
+	+ ofGetCurrentNormalMatrix
+	+ ofSetOpenGL(ES)Version, allows to set any specific GL version
+
+### graphics
+	+ ofTruetypeFont: kerning and better hinting and spacing
+
+PLATFORM SPECIFIC
+-----------------
+
+### Emscripten
+	+ New platform!
+
+
+
+
+OF 0.8.3
 ========
 
 #### change key  
 	  + added  
 	  - removed  
 	  / modified  
 
-### Graphics
-	+ ofGetCurrentOrientationMatrix(): query current orientation matrix state (supported by ofGLProgrammableRenderer, ofGLRenderer)
+------------------------------------------------------------------------------
+        
+PLATFORM SPECIFIC
+-----------------
+###OSX
+	/ ofAppGLFWWindow: Drag drop files were coming in empty
+### Windows 
+	/ ofAppGLFWWindow: Drag drop files were coming in empty
+
+
+CORE ADDONS
+-----------
+### ofxKinect
+	/ small fixes for CodeBlocks compilation on Windows
+
+
+
+OF 0.8.2
+========
+
+#### change key  
+	  + added  
+	  - removed  
+	  / modified  
 
 ------------------------------------------------------------------------------
 
 CORE
 ----
 ### 3d
 	/ fix of3DPrimitive copy constructor not copying node
-	
+        
 ### app
 	+ ofAppEGLWindow added new methods hasMouse()/hasKeyboard() to provide info on whether mouse/keyboard were detected
 	+ ofAppEGLWindow has new method setThreadTimeout allowing adjustable wait time for the thread to join
+	/ ofAppGLFWWindow: fix key mappings on non english keyboards
+	/ ofAppGLFWWindow: Cleaner exit code for GLFW based apps. 
+	/ ofAppGLFWWindow: fixes for better Retina support. 
+	/ Updated GLFW to latest master branch
+	/ ofAppGLFWWindow: added patch to handle special keys and cases. 
+	/ ofAppGLFWWindow: better support for non-english keyboards. 
+	/ ofAppGLFWWindow: small bugfix for GLFW drag drop callback for retina screens. Closes
+	/ ofSystem bugfix for successive calls. Now uses pclose instead of fclose.
 ### events
 	+ fix ofSetFrameRate to be more accurate
+	+ add keycode, scancode and unicode codepoint to ofKeyEventArgs
 ### gl
 	+ ofFbo: added new method to attach an external texture
 	+ ofFbo: fix regression on min/max filter settings
 ### Graphics
 	/ ofImage: convert format when loading different image types
 	/ Fix ofSetupPerspective not using passed width and height
+	/ of3DPrimitives: fix copy constructor
 ### Math
 	/ fix ofQuaternion setOrientation and getEulerOrientation
+	/ ofMatrix: add case to catch invalid matrix queries
+	+ ofGetCurrentOrientationMatrix(): query current orientation matrix state (supported by ofGLProgrammableRenderer, ofGLRenderer)
 ### Utils
 	/ ofThread now uses Class name for logging channel (was thread name)
 	/ ofURLFileLoader: better shutdown, don't shutdown if it wasn't initialized + wait thread
-
+	/ ofXml: fixes crash on empty document
+	/ ofSystem: fix for second and later calls failing
+	+ ofThread argument for tryJoin time.
+	/ ofThread overall, documentation and example fixes
+	/ ofThread change to infinite wait. 
+	/ ofParameterGroup: fix to allow nested ofParameterGroups
+	/ ofParameterGroup: memory leak fix
+	/ ofThread: detach thread on stop if it's not being waited.
+	/ ofParameter(Group) fix polymorphism on parameter groups
+        
 PLATFORM SPECIFIC
 -----------------
 ### Android
@@ -42,23 +116,44 @@ PLATFORM SPECIFIC
 	/ fixed shader in shader example
 	/ disable x86 in assimp and opencv examples
 	/ shader and assimp examples reload gl resources when the app resumes
+### iOS
+	+ implement setSpeed() for video player
+	+ ofxiOSGetDeviceInfo for querying major / minor versions, device type and device string
+	+ move to cleaner NSAutoreleasePool for iOS projects. 
+	/ iOS-VideoGrabber memory related fixes
+	/ ofxiOSVideoPlayer: setSpeed functionality. 
+	+ ofxiOSSoundPlayer: added getAVSoundPlayer() method
+	/ bugfix for ofxiOSImagePicker crashing on exit. 
+	/ ofxiOSImagePicker: switch to using ofPixels.
 ### Linux
 	/ video: fixes for videos which pixels have padding
 	/ video: close pipeline properly by sending and waiting for EOS event
 	/ system: fix dialog boxes
 	/ install & make: detect and use gtk 3 instead of 2 if it's available
 ###OSX
 	/ Reduce warnings on OSX
+	/ ofxOsc: Fix for issue with UDP multicast socket on OSX.
+### Windows
+	/ ofAppGLFWWindow: Correct fullscreen multi monitor display on Windows
 
-ORE ADDONS
+
+CORE ADDONS
 -----------
 ### ofxAssimpModelLoader
 	/ fix to be able to put loaders on vectors
+	/ use shared_ptr for assimp scene
 ### ofxGui
 	+ ofxSlider: added get/setMin/Max
-
+	/ ofxGui: fixed for mouse registration issues with ofxGui. ofxPanel was registering for mouse events 3 times on setup! - ofxButton was registering for events in setup and registering again in the destructor. - ofxSlider was never unregistering mouse events.
+### ofxKinect
+	/ bugfix to fix Kinect not being able to re-open if device was not correctly shutdown. 
+	/ bugfix for Kinect IR image crashing. Now sets the correct image sizes. 
 ### ofxNetwork
 	/ fix port reuse on osx
+### ofxOsc
+	+ added blob support. ability to send ofBuffers as blobs. Note: max data size limited by network buffer sizes. 
+        
+        
 
 OF 0.8.1
 ========

addons/.gitignore

@@ -21,6 +21,7 @@ ofxAndroid/ofAndroidLib/gen
 !ofxThreadedImageLoader
 !ofxVectorGraphics
 !ofxXmlSettings
+!ofxEmscripten
 
 # don't ignore the .gitignore file
 !.gitignore

addons/ofxAndroid/src/ofAppAndroidWindow.h

@@ -9,7 +9,7 @@
 
 #include "ofAppBaseWindow.h"
 
-class ofAppAndroidWindow: public ofAppBaseWindow {
+class ofAppAndroidWindow: public ofAppBaseGLESWindow {
 public:
 	ofAppAndroidWindow();
 	virtual ~ofAppAndroidWindow();

addons/ofxAssimpModelLoader/src/ofxAssimpAnimation.cpp

@@ -4,8 +4,6 @@
 //
 
 #include "ofxAssimpAnimation.h"
-#include "assimp.h"
-#include "aiScene.h"
 
 ofxAssimpAnimation::ofxAssimpAnimation(shared_ptr<const aiScene> scene, aiAnimation * animation) {
     this->scene = scene;
@@ -39,6 +37,8 @@ aiAnimation * ofxAssimpAnimation::getAnimation() {
 void ofxAssimpAnimation::update() {
     animationPrevTime = animationCurrTime;
     animationCurrTime = ofGetElapsedTimef();
+    double tps = animation->mTicksPerSecond ? animation->mTicksPerSecond : 25.f;
+    animationCurrTime *= tps;
 
     if(!bPlay || bPause) {
         return;

addons/ofxAssimpModelLoader/src/ofxAssimpAnimation.h

@@ -6,9 +6,8 @@
 #pragma once
 
 #include "ofMain.h"
-
-class aiScene;
-class aiAnimation;
+#include "assimp.h"
+#include "aiScene.h"
 
 class ofxAssimpAnimation {
 

addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp

@@ -683,15 +683,6 @@ void ofxAssimpModelLoader::draw(ofPolyRenderMode renderType) {
 
     ofPushStyle();
 
-    if(!ofGetGLProgrammableRenderer()){
-	#ifndef TARGET_OPENGLES
-		glPushAttrib(GL_ALL_ATTRIB_BITS);
-		glPushClientAttrib(GL_CLIENT_ALL_ATTRIB_BITS);
-		glPolygonMode(GL_FRONT_AND_BACK, ofGetGLPolyMode(renderType));
-	#endif
-		glEnable(GL_NORMALIZE);
-    }
-
     ofPushMatrix();
     ofMultMatrix(modelMatrix);
 
@@ -700,7 +691,7 @@ void ofxAssimpModelLoader::draw(ofPolyRenderMode renderType) {
 
         ofPushMatrix();
         ofMultMatrix(mesh.matrix);
-        
+
         if(bUsingTextures){
             if(mesh.hasTexture()) {
                 mesh.getTextureRef().bind();
@@ -710,7 +701,7 @@ void ofxAssimpModelLoader::draw(ofPolyRenderMode renderType) {
         if(bUsingMaterials){
             mesh.material.begin();
         }
-        
+
         if(mesh.twoSided) {
             glEnable(GL_CULL_FACE);
         }
@@ -747,15 +738,8 @@ void ofxAssimpModelLoader::draw(ofPolyRenderMode renderType) {
 
         ofPopMatrix();
     }
-
-    ofPopMatrix();
 
-    if(!ofGetGLProgrammableRenderer()){
-	#ifndef TARGET_OPENGLES
-		glPopClientAttrib();
-		glPopAttrib();
-	#endif
-    }
+    ofPopMatrix();
     ofPopStyle();
 }
 

addons/ofxEmscripten/.cproject

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.2615331">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.2615331" moduleId="org.eclipse.cdt.core.settings" name="Default">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.2615331" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.2615331.551189518" name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.base.798155380" name="cdt.managedbuild.toolchain.gnu.base" superClass="cdt.managedbuild.toolchain.gnu.base">
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.435901729" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
+							<builder id="cdt.managedbuild.target.gnu.builder.base.292857421" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1392184065" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.637027421" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+								<option id="gnu.cpp.compiler.option.include.paths.377526172" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="/home/arturo/Code/emscripten/system/include"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.766813049" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1470088548" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1983967753" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.1697575471" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.1867818988" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1355529422" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.base.115754852" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.821541129" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="ofxEmscripten.null.160251491" name="ofxEmscripten"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Default">
+			<resource resourceType="PROJECT" workspacePath="/ofxEmscripten"/>
+		</configuration>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.2615331;cdt.managedbuild.toolchain.gnu.base.2615331.551189518;cdt.managedbuild.tool.gnu.c.compiler.base.1470088548;cdt.managedbuild.tool.gnu.c.compiler.input.1983967753">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.2615331;cdt.managedbuild.toolchain.gnu.base.2615331.551189518;cdt.managedbuild.tool.gnu.cpp.compiler.base.637027421;cdt.managedbuild.tool.gnu.cpp.compiler.input.766813049">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+</cproject>

addons/ofxEmscripten/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ofxEmscripten</name>
+	<comment></comment>
+	<projects>
+		<project>openFrameworks</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>

addons/ofxEmscripten/libs/html5audio/include/html5audio.h

@@ -0,0 +1,26 @@
+#pragma once
+
+extern "C"{
+	typedef void (*html5audio_stream_callback)(int bufferSize, int inputChannels, int outputChannels, void * userData);
+
+	extern int html5audio_context_create();
+	extern int html5audio_context_samplerate(int context);
+	extern void html5audio_context_spectrum(int context, int bands, float * spectrum);
+
+	extern int html5audio_sound_load(int context, const char* url);
+	extern void html5audio_sound_play(int context, int sound, double offset);
+	extern void html5audio_sound_stop(int sound);
+	extern void html5audio_sound_pause(int sound);
+	extern double html5audio_sound_rate(int sound);
+	extern void html5audio_sound_set_rate(int sound, double rate);
+	extern int html5audio_sound_done(int sound);
+	extern double html5audio_sound_duration(int sound);
+	extern double html5audio_sound_position(int sound);
+	extern void html5audio_sound_set_loop(int sound, int loop);
+	extern double html5audio_sound_gain(int sound);
+	extern void html5audio_sound_set_gain(int sound, double volume);
+	extern void html5audio_sound_free(int sound);
+
+	extern int html5audio_stream_create(int context_id, int bufferSize, int inputChannels, int outputChannels, float * inbuffer, float * outbuffer, html5audio_stream_callback callback, void * userData);
+	extern int html5audio_stream_free(int stream);
+}