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

Author: ofTheo

addons/ofxEmscripten/libs/html5audio/lib/emscripten/library_html5audio.js

@@ -202,55 +202,47 @@ var LibraryHTML5Audio = {
     },
 
     html5audio_stream_create: function(bufferSize, inputChannels, outputChannels, inbuffer, outbuffer, callback, userData) {
-        var stream = AUDIO.context.createScriptProcessor(bufferSize, inputChannels, outputChannels);
-        var inbufferArray = Module.HEAPF32.subarray(inbuffer >> 2,(inbuffer>>2) + bufferSize * inputChannels);
-        var outbufferArray = Module.HEAPF32.subarray(outbuffer >> 2, (outbuffer>>2) + bufferSize * outputChannels);
-
-        stream.onaudioprocess = function(event) {
-            var i, j, c;
-            if (inputChannels > 0) {
-                for (c = 0; c < inputChannels; ++c) {
-                    var inChannel = event.inputBuffer.getChannelData(c);
-                    for (i = 0, j = c; i < bufferSize; ++i, j += inputChannels) {
-                        inbufferArray[j] = inChannel[i];
+            var stream = AUDIO.context.createScriptProcessor(bufferSize, inputChannels, outputChannels);
+            var inbufferArray = Module.HEAPF32.subarray(inbuffer >> 2, (inbuffer >> 2) + bufferSize * inputChannels);
+            var outbufferArray = Module.HEAPF32.subarray(outbuffer >> 2, (outbuffer >> 2) + bufferSize * outputChannels);
+
+            stream.onaudioprocess = function(event) {
+                var i, j, c;
+                if (inputChannels > 0) {
+                    for (c = 0; c < inputChannels; ++c) {
+                        var inChannel = event.inputBuffer.getChannelData(c);
+                        for (i = 0, j = c; i < bufferSize; ++i, j += inputChannels) {
+                            inbufferArray[j] = inChannel[i];
+                        }
                     }
                 }
-            }
 
-            {{{ makeDynCall('viiii', 'callback') }}}(bufferSize, inputChannels, outputChannels, userData);
+                {{{ makeDynCall('viiii', 'callback') }}}(bufferSize, inputChannels, outputChannels, userData);
 
-            if (outputChannels > 0) {
-                for (c = 0; c < outputChannels; ++c) {
-                    var outChannel = event.outputBuffer.getChannelData(c);
-                    for (i = 0, j = c; i<bufferSize; ++i, j += outputChannels) {
-                        outChannel[i] = outbufferArray[j];
+                if (outputChannels > 0) {
+                    for (c = 0; c < outputChannels; ++c) {
+                        var outChannel = event.outputBuffer.getChannelData(c);
+                        for (i = 0, j = c; i < bufferSize; ++i, j += outputChannels) {
+                            outChannel[i] = outbufferArray[j];
+                        }
                     }
                 }
-            }
-        };
+            };
 
-        if (inputChannels > 0) {
-            navigator.getUserMedia = navigator.getUserMedia ||
-            navigator.webkitGetUserMedia ||
-            navigator.mozGetUserMedia ||
-            navigator.msGetUserMedia;
-            
-	    if (navigator.getUserMedia) {
-                navigator.getUserMedia(
-                {audio: true},
-                function (audioIn){
-                    var mediaElement = AUDIO.context.createMediaStreamSource(audioIn);
-                    mediaElement.connect(stream);
-                    AUDIO.mediaElement = mediaElement;
-                },
-                function (error){
-                    console.log("error creating audio in",error);
-                });
-	    }
-        }
+            if (inputChannels > 0) {
+                navigator.mediaDevices.getUserMedia({ audio: true })
+                    .then(function (audioIn) {
+                        var mediaElement = AUDIO.context.createMediaStreamSource(audioIn);
+                        mediaElement.connect(stream);
+                        AUDIO.mediaElement = mediaElement;
+                    })
+                    .catch(function (error) {
+                        console.log("Error creating audio in", error);
+                    });
+            }
 
-        stream.connect(AUDIO.fft);
-    },
+            stream.connect(AUDIO.fft);
+        },
 
     html5audio_stream_free: function () {
 

addons/ofxEmscripten/libs/html5video/lib/emscripten/library_html5video.js

@@ -149,10 +149,6 @@ var LibraryHTML5Video = {
             GLctx.texParameteri(GLctx.TEXTURE_2D, GLctx.TEXTURE_WRAP_S, GLctx.CLAMP_TO_EDGE);
             GLctx.texParameteri(GLctx.TEXTURE_2D, GLctx.TEXTURE_WRAP_T, GLctx.CLAMP_TO_EDGE);
             VIDEO.player[player_id].textureId = texId;
-            
-            if (typeof VIDEO.player[player_id].audioTracks == "undefined") {
-                VIDEO.player[player_id].muted = true;
-            }
 
             // Check the file size
             //console.log('File size:' + fileSizeInBytes);

addons/ofxKinect/src/ofxKinect.cpp

@@ -382,7 +382,7 @@ void ofxKinect::update() {
 		tryCount = 0;
 		if(this->lock()) {
             if( videoPixels.getHeight() == videoPixelsIntra.getHeight() ){
-                swap(videoPixels,videoPixelsIntra);
+                std::swap(videoPixels,videoPixelsIntra);
             }else{
 				int minimumSize = MIN(videoPixels.size(), videoPixelsIntra.size());
 				memcpy(videoPixels.getData(), videoPixelsIntra.getData(), minimumSize);
@@ -402,7 +402,7 @@ void ofxKinect::update() {
 		bIsFrameNewDepth = true;
 		tryCount = 0;
 		if(this->lock()) {
-			swap(depthPixelsRaw, depthPixelsRawIntra);
+			std::swap(depthPixelsRaw, depthPixelsRawIntra);
 			bNeedsUpdateDepth = false;
 			this->unlock();
 
@@ -807,7 +807,7 @@ void ofxKinect::grabDepthFrame(freenect_device *dev, void *depth, uint32_t times
 
 	if(kinect->kinectDevice == dev) {
 		kinect->lock();
-		swap(kinect->depthPixelsRawBack,kinect->depthPixelsRawIntra);
+		std::swap(kinect->depthPixelsRawBack,kinect->depthPixelsRawIntra);
 		kinect->bNeedsUpdateDepth = true;
 		kinect->unlock();
 		freenect_set_depth_buffer(kinect->kinectDevice,kinect->depthPixelsRawBack.getData());
@@ -821,7 +821,7 @@ void ofxKinect::grabVideoFrame(freenect_device *dev, void *video, uint32_t times
 
 	if(kinect->kinectDevice == dev) {
 		kinect->lock();
-		swap(kinect->videoPixelsBack,kinect->videoPixelsIntra);
+		std::swap(kinect->videoPixelsBack,kinect->videoPixelsIntra);
 		kinect->bNeedsUpdateVideo = true;
 		kinect->unlock();
 		freenect_set_video_buffer(kinect->kinectDevice,kinect->videoPixelsBack.getData());
@@ -972,7 +972,7 @@ bool ofxKinectContext::open(ofxKinect& kinect, int id) {
 		ofLogError("ofxKinect") << "could not open device " <<  id;
 		return false;
 	}
-	kinects.insert(pair<int,ofxKinect*>(id, &kinect));
+	kinects.insert(std::pair<int,ofxKinect*>(id, &kinect));
 
 	// set kinect id & serial from bus id
 	kinect.deviceId = id;
@@ -1003,7 +1003,7 @@ bool ofxKinectContext::open(ofxKinect& kinect, string serial) {
 		return false;
 	}
 	int index = getDeviceIndex(serial);
-	kinects.insert(pair<int,ofxKinect*>(deviceList[index].id, &kinect));
+	kinects.insert(std::pair<int,ofxKinect*>(deviceList[index].id, &kinect));
 	kinect.deviceId = deviceList[index].id;
 	kinect.serial = serial;
 
@@ -1068,7 +1068,7 @@ void ofxKinectContext::listDevices(bool verbose) {
     if(!isInited())
 		init();
 
-	stringstream stream;
+	std::stringstream stream;
 
 	if(numTotal() == 0) {
 		stream << "no devices found";

examples/computer_vision/kinectExample/src/ofApp.cpp

@@ -124,27 +124,27 @@ void ofApp::draw() {
 
 	// draw instructions
 	ofSetColor(255, 255, 255);
-	stringstream reportStream;
+	std::stringstream reportStream;
 
 	if(kinect.hasAccelControl()) {
 		reportStream << "accel is: " << ofToString(kinect.getMksAccel().x, 2) << " / "
 		<< ofToString(kinect.getMksAccel().y, 2) << " / "
-		<< ofToString(kinect.getMksAccel().z, 2) << endl;
+		<< ofToString(kinect.getMksAccel().z, 2) << std::endl;
 	} else {
-		reportStream << "Note: this is a newer Xbox Kinect or Kinect For Windows device," << endl
-		<< "motor / led / accel controls are not currently supported" << endl << endl;
+		reportStream << "Note: this is a newer Xbox Kinect or Kinect For Windows device," << std::endl
+		<< "motor / led / accel controls are not currently supported" << std::endl << std::endl;
 	}
 
-	reportStream << "press p to switch between images and point cloud, rotate the point cloud with the mouse" << endl
-	<< "using opencv threshold = " << bThreshWithOpenCV <<" (press spacebar)" << endl
-	<< "set near threshold " << nearThreshold << " (press: + -)" << endl
+	reportStream << "press p to switch between images and point cloud, rotate the point cloud with the mouse" << std::endl
+	<< "using opencv threshold = " << bThreshWithOpenCV <<" (press spacebar)" << std::endl
+	<< "set near threshold " << nearThreshold << " (press: + -)" << std::endl
 	<< "set far threshold " << farThreshold << " (press: < >) num blobs found " << contourFinder.nBlobs
-	<< ", fps: " << ofGetFrameRate() << endl
-	<< "press c to close the connection and o to open it again, connection is: " << kinect.isConnected() << endl;
+	<< ", fps: " << ofGetFrameRate() << std::endl
+	<< "press c to close the connection and o to open it again, connection is: " << kinect.isConnected() << std::endl;
 
 	if(kinect.hasCamTiltControl()) {
-		reportStream << "press UP and DOWN to change the tilt angle: " << angle << " degrees" << endl
-		<< "press 1-5 & 0 to change the led mode" << endl;
+		reportStream << "press UP and DOWN to change the tilt angle: " << angle << " degrees" << std::endl
+		<< "press 1-5 & 0 to change the led mode" << std::endl;
 	}
 
 	ofDrawBitmapString(reportStream.str(), 20, 652);
@@ -304,4 +304,4 @@ void ofApp::mouseExited(int x, int y){
 void ofApp::windowResized(int w, int h)
 {
 
-}
+}

examples/gl/materialPBRAdvanced/bin/data/shaders/main.vert

@@ -1,12 +1,25 @@
-
+// we set this define in the ofApp class
+#if defined(SHADOW_DEPTH_PASS)
+uniform mat4 modelMatrix;
+in vec4 position;
+uniform float iElapsedTime;
+uniform float uWiggleVerts;
+#else
 // the mesh we are using does not have texture coordinates
 // so we are going to send the local vertex positions to use for animation
 OUT vec3 v_localPos;
+#endif
+
 
 void main (void){
+	vec4 npos = position;
+	npos.xyz += uWiggleVerts * 0.25 * vec3( cos(iElapsedTime*1.3+(position.z*1.25)+position.y*1.25), 0.0, 0.0);
+#if defined(SHADOW_DEPTH_PASS)
+	vec3 worldPosition = (modelMatrix * vec4(npos.xyz, 1.0)).xyz;
+	sendShadowDepthWorldPosition(worldPosition);
+#else
 	v_localPos = position.xyz;
-	vec4 npos = getTransformedPosition();
-//	npos.xyz += vec3( cos(iElapsedTime+v_localPos.y*1.85), 0.0, 0.0);
 	sendVaryings(npos);
 	gl_Position = modelViewProjectionMatrix * npos;
+#endif
 }

examples/gl/materialPBRAdvanced/src/ofApp.cpp

@@ -72,15 +72,15 @@ void ofApp::draw(){
 		int numShadowPasses = light.getNumShadowDepthPasses();
 		for( int j = 0; j < numShadowPasses; j++ ) {
 			light.beginShadowDepthPass(j);
-			renderScene();
+			renderScene(true);
 			light.endShadowDepthPass(j);
 		}
 	}
 
 
 	camera.begin(); {
 
-		renderScene();
+		renderScene(false);
 
 		 if( cubeMap.hasPrefilteredMap() ) {
 		 	cubeMap.drawPrefilteredCube(0.2f);
@@ -108,11 +108,12 @@ void ofApp::draw(){
 
 	stringstream ss;
 	ss << "Reload shader(r): make changes to shader in data/shaders/main.frag and then press 'r' to see changes.";
+	ss << endl << "Wiggle verts(w): " << (bWiggleVerts ? "yes" : "no");
 	ofDrawBitmapStringHighlight(ss.str(), 40, 40);
 }
 
 //--------------------------------------------------------------
-void ofApp::renderScene() {
+void ofApp::renderScene(bool bShadowPass) {
 
 	matFloor.setMetallic(0.0);
 	matFloor.setReflectance(0.01);
@@ -140,7 +141,14 @@ void ofApp::renderScene() {
 	ofPopMatrix();
 	matSphere.end();
 
+	if( bShadowPass && bWiggleVerts ) {
+		mDepthShader.begin();
+		mDepthShader.setUniform1f("iElapsedTime", ofGetElapsedTimef());
+		mDepthShader.setUniform1f("uWiggleVerts", bWiggleVerts ? 1.0f : 0.0f);
+	}
+	// setting custom uniforms on a material automatically adds it to the shader
 	matLogo.setCustomUniform1f("iElapsedTime", ofGetElapsedTimef());
+	matLogo.setCustomUniform1f("uWiggleVerts", bWiggleVerts ? 1.0f : 0.0f);
 	matLogo.begin();
 	ofPushMatrix();
 	ofTranslate( -70, -250, 0 );
@@ -149,6 +157,9 @@ void ofApp::renderScene() {
 	meshLogoHollow.draw();
 	ofPopMatrix();
 	matLogo.end();
+	if(bShadowPass && bWiggleVerts ) {
+		mDepthShader.end();
+	}
 }
 
 //--------------------------------------------------------------
@@ -161,6 +172,9 @@ bool ofApp::reloadShader() {
 	if( vbuffer.size() && fbuffer.size() ) {
 		matLogo.setShaderMain(vbuffer.getText(), GL_VERTEX_SHADER, "main.vert");
 		matLogo.setShaderMain(fbuffer.getText(), GL_FRAGMENT_SHADER, "main.frag");
+		// configure the shader to include shadow functions for passing depth
+		// declare a define so we can use the same shader file and run different bits of code
+		light.getShadow().setupShadowDepthShader(mDepthShader, "#define SHADOW_DEPTH_PASS\n"+vbuffer.getText());
 		return true;
 	}
 	return false;
@@ -174,6 +188,9 @@ void ofApp::keyPressed(int key){
 	if( key == 'd' ) {
 		bDebug = !bDebug;
 	}
+	if( key == 'w') {
+		bWiggleVerts = !bWiggleVerts;
+	}
 }
 
 //--------------------------------------------------------------

examples/gl/materialPBRAdvanced/src/ofApp.h

@@ -9,7 +9,7 @@ class ofApp : public ofBaseApp{
 		void update();
 		void draw();
 
-		void renderScene();
+		void renderScene(bool bShadowPass);
 
 		bool reloadShader();
 
@@ -35,9 +35,12 @@ class ofApp : public ofBaseApp{
 
 		ofVboMesh meshPlySphere;
 
+		ofShader mDepthShader;
+	
 		int mode = 0;
 
 		ofLight light;
 		bool bDebug = false;
+		bool bWiggleVerts = false;
 
 };

libs/openFrameworks/ofMain.h

@@ -113,6 +113,28 @@
 #include "ofNode.h"
 
 //--------------------------
+#ifdef OF_LEGACY_INCLUDE_STD
 using namespace std;
-
+#else 
+
+// this will eventually be disabled by default 
+#define OF_USE_MINIMAL_STD 
+#ifdef OF_USE_MINIMAL_STD
+using std::string;
+using std::stringstream;
+using std::endl;
+using std::vector;
+using std::max;
+using std::make_shared;
+using std::deque;
+using std::cout;
+using std::swap;
+using std::pair;
+using std::map;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::to_string;
+#endif
 #endif
+
+#endif // OF_MAIN_H