Merge pull request scratchfoundation#846 from LLK/fix-transparent-video

sclements · sclements · commit 6ae9d10a3a18 · 2015-07-13T09:26:51.000-06:00
Apply video transparency as ghost effect
diff --git a/src/render3d/DisplayObjectContainerIn3D.as b/src/render3d/DisplayObjectContainerIn3D.as
@@ -818,7 +818,7 @@ public class DisplayObjectContainerIn3D extends Sprite {SCRATCH::allow3d{
 				scale = 1 / mosaic;
 			}
 		}
-		else if (dispObj is Bitmap) { // Remove else to allow graphics effects on video layer
+		if (dispObj is Bitmap) {
 			isNew = !bitmapsByID[id];
 			bitmapsByID[id] = (dispObj as Bitmap).bitmapData;
 			if (unrenderedChildren[dispObj] && textureIndexByID.hasOwnProperty(id)) {
diff --git a/src/scratch/ScratchStage.as b/src/scratch/ScratchStage.as
@@ -466,13 +466,21 @@ public class ScratchStage extends ScratchObj {
 			video.attachCamera(camera);
 			videoImage = new Bitmap(new BitmapData(video.width, video.height, false));
 			videoImage.alpha = videoAlpha;
+			SCRATCH::allow3d {
+				updateSpriteEffects(videoImage, {'ghost': 100 * (1 - videoAlpha)});
+			}
 			addChildAt(videoImage, getChildIndex(penLayer) + 1);
 		}
 	}
 
 	public function setVideoTransparency(transparency:Number):void {
 		videoAlpha = 1 - Math.max(0, Math.min(transparency / 100, 1));
-		if (videoImage) videoImage.alpha = videoAlpha;
+		if (videoImage) {
+			videoImage.alpha = videoAlpha;
+			SCRATCH::allow3d {
+				updateSpriteEffects(videoImage, {'ghost': transparency});
+			}
+		}
 	}
 
 	public function isVideoOn():Boolean { return videoImage != null }
@@ -546,11 +554,6 @@ public class ScratchStage extends ScratchObj {
 	SCRATCH::allow3d
 	public function updateSpriteEffects(spr:DisplayObject, effects:Object):void {
 		if(Scratch.app.isIn3D) {
-			if (videoImage && videoImage.alpha < 1) {
-				if (!effects) effects = {};
-				if (!effects.ghost) effects.ghost = BlockArg.epsilon;
-			}
-
 			Scratch.app.render3D.updateFilters(spr, effects);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -818,7 +818,7 @@ public class DisplayObjectContainerIn3D extends Sprite {SCRATCH::allow3d{`
`818`	`818`	`scale = 1 / mosaic;`
`819`	`819`	`}`
`820`	`820`	`}`
`821`		`- else if (dispObj is Bitmap) { // Remove else to allow graphics effects on video layer`
	`821`	`+ if (dispObj is Bitmap) {`
`822`	`822`	`isNew = !bitmapsByID[id];`
`823`	`823`	`bitmapsByID[id] = (dispObj as Bitmap).bitmapData;`
`824`	`824`	`if (unrenderedChildren[dispObj] && textureIndexByID.hasOwnProperty(id)) {`