April 2015 release

Author: DavidWyand-GG

src/Designer-app.xml

@@ -27,7 +27,7 @@
 	<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
 	Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
 	An updated version of application must have a versionNumber value higher than the previous version. Required for namespace >= 2.5 . -->
-	<versionNumber>0.0.1</versionNumber>
+	<versionNumber>0.0.3</versionNumber>
 
 	<!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
 	<!-- <versionLabel></versionLabel> -->

src/Designer.as

@@ -4,7 +4,9 @@
 
 package {
 	import flash.desktop.NativeApplication;
-	import flash.events.*;
+	import flash.events.Event;
+	import flash.events.IOErrorEvent;
+	import flash.events.InvokeEvent;
 	import flash.filesystem.File;
 	import flash.filesystem.FileMode;
 	import flash.filesystem.FileStream;
@@ -14,6 +16,10 @@ package {
 	import flash.text.TextFormat;
 	import flash.utils.ByteArray;
 
+	import scratch.ScratchObj;
+	
+	import ui.parts.GlobalTabPart;
+	
 	import uiwidgets.DialogBox;
 	import uiwidgets.Menu;
 
@@ -22,6 +28,10 @@ package {
 public class Designer extends Scratch {
 	public static var dapp:Designer; // static reference to the app, used for debugging
 
+	protected var lastViewedObject:ScratchObj = null;
+	
+	protected var globalTabPart:GlobalTabPart;
+
 	protected var displayFPSCounter:Boolean = false;	// Tracks displaying the FPS counter
 
 	public var projectPath:String = '';				// The OS path to the save file, including name
@@ -103,6 +113,10 @@ public class Designer extends Scratch {
 		if (b.lastEvent.shiftKey) {
 			m.addLine();
 			m.addItem('Toggle FPS Counter', toggleFPSCounter);
+
+			m.addItem('Toggle Focus Area blocks', toggleFocusAreaBlocks);
+			
+			m.addItem('Toggle Global Tab', toggleGlobalTab);
 		}
 	}
 
@@ -115,11 +129,25 @@ public class Designer extends Scratch {
 			addFrameRateReadout(10, 29);
 		}
 	}
+	
+	protected function toggleFocusAreaBlocks():void {
+		if (app.canAddFocusAreaBlocks) {
+			app.canAddFocusAreaBlocks = false;
+		} else {
+			app.canAddFocusAreaBlocks = true;
+		}
+		
+		Scratch.app.translationChanged();
+	}
+	
+	protected function toggleGlobalTab():void {
+		tabsPart.toggleGlobalTab();
+	}
 
 	override public function showAboutMenu(b:*):void {
 		// Just display a dialog
 		DialogBox.notify(
-			'DevPro Game Snap',
+			'DevPro Game Snap v0.0.3',
 			'\nCopyright © 2015 GarageGames LLC' +
 			'\n\nBased on Scratch from the MIT Media Laboratory' +
 			'\nunder the GPL 2 license.', stage);
@@ -249,6 +277,96 @@ public class Designer extends Scratch {
 			stage);
 	}
 
+	// Override the Scratch.as version
+	override protected function addParts():void {
+		super.addParts();
+		
+		//globalTabPart = new GlobalTabPart(this);
+		
+	}
+	
+	// Copied from Scratch.as
+	override public function selectSprite(obj:ScratchObj):void {
+		if (isShowing(imagesPart)) imagesPart.editor.shutdown();
+		if (isShowing(soundsPart)) soundsPart.editor.shutdown();
+		viewedObject = obj;
+		libraryPart.refresh();
+		tabsPart.refresh();
+		if (isShowing(imagesPart)) {
+			imagesPart.refresh();
+		}
+		if (isShowing(soundsPart)) {
+			soundsPart.currentIndex = 0;
+			soundsPart.refresh();
+		}
+		if (isShowing(scriptsPart)) {
+			if(scriptsPart.isViewingGlobalTab()) {
+				// Force a change to the Scripts tabs when switching sprites
+				setTab("scripts");
+			}
+			else {
+				scriptsPart.updatePalette();
+				scriptsPane.viewScriptsFor(obj);
+				scriptsPart.updateSpriteWatermark();
+			}
+		}
+	}
+
+	// Copied from Scratch.as
+	override public function setTab(tabName:String):void {
+		if (isShowing(imagesPart)) imagesPart.editor.shutdown();
+		if (isShowing(soundsPart)) soundsPart.editor.shutdown();
+		hide(scriptsPart);
+		hide(imagesPart);
+		hide(soundsPart);
+		//hide(globalTabPart);
+		if (!editMode) return;
+		if (tabName == 'images') {
+			show(imagesPart);
+			imagesPart.refresh();
+		} else if (tabName == 'sounds') {
+			soundsPart.refresh();
+			show(soundsPart);
+		} else if (tabName == 'global') {
+			scriptsPart.setGlobalTab(true);
+			
+			if(viewedObject != stagePane.globalObjSprite()) {
+				lastViewedObject = viewedObject;
+			}
+			
+			viewedObject = stagePane.globalObjSprite();// Try and present only the global sprite
+			libraryPart.refresh();
+			tabsPart.refresh();
+			
+			scriptsPart.updatePalette();
+			scriptsPane.viewScriptsFor(viewedObject);
+			//scriptsPart.updateSpriteWatermark();
+			scriptsPart.clearSpriteWatermark();
+			show(scriptsPart);
+		} else if (tabName && (tabName.length > 0)) {
+			tabName = 'scripts';
+			scriptsPart.setGlobalTab(false);
+			
+			// Do we need to switchto the last viewed object?
+			if(viewedObject == stagePane.globalObjSprite() && lastViewedObject != null) {
+				viewedObject = lastViewedObject;
+				lastViewedObject = null;
+				libraryPart.refresh();
+				tabsPart.refresh();
+			}
+			
+			scriptsPart.updatePalette();
+			scriptsPane.viewScriptsFor(viewedObject);
+			scriptsPart.updateSpriteWatermark();
+			show(scriptsPart);
+		}
+		show(tabsPart);
+		show(stagePart); // put stage in front
+		tabsPart.selectTab(tabName);
+		lastTab = tabName;
+		if (saveNeeded) setSaveNeeded(true); // save project when switching tabs, if needed (but NOT while loading!)
+	}
+
 	// Get the project's native file path (including file name)
 	public function getProjectPath():String {
 		return projectPath;

src/Scratch.as

@@ -71,6 +71,11 @@ public class Scratch extends Sprite {
 	public var render3D:IRenderIn3D;
 	public var isArmCPU:Boolean;
 	public var jsEnabled:Boolean = false; // true when the SWF can talk to the webpage
+	
+	// For Game Snap
+	public static const gameSnapFileVersion:int = 1;	// The current Game Snap file version
+	public var gameSnapLastReadFileVersion:int = 0;		// The last read Game Snap file version
+	public var canAddFocusAreaBlocks:Boolean = false;	// Determines whether Focus Area blocks can be added from the More Blocks category
 
 	// Runtime
 	public var runtime:ScratchRuntime;
@@ -87,8 +92,8 @@ public class Scratch extends Sprite {
 	public var debugOpCmd:String = '';
 
 	protected var autostart:Boolean;
-	private var viewedObject:ScratchObj;
-	private var lastTab:String = 'scripts';
+	protected var viewedObject:ScratchObj;
+	protected var lastTab:String = 'scripts';
 	protected var wasEdited:Boolean; // true if the project was edited and autosaved
 	private var _usesUserNameBlock:Boolean = false;
 	protected var languageChanged:Boolean; // set when language changed
@@ -106,7 +111,7 @@ public class Scratch extends Sprite {
 	public var libraryPart:LibraryPart;
 	protected var topBarPart:TopBarPart;
 	protected var stagePart:StagePart;
-	private var tabsPart:TabsPart;
+	protected var tabsPart:TabsPart;
 	protected var scriptsPart:ScriptsPart;
 	public var imagesPart:ImagesPart;
 	public var soundsPart:SoundsPart;

src/Specs.as

@@ -27,6 +27,7 @@
 
 package {
 	import flash.display.Bitmap;
+	
 	import assets.Resources;
 
 public class Specs {
@@ -47,14 +48,16 @@ public class Specs {
 	public static const dataCategory:int = 9;
 	public static const myBlocksCategory:int = 10;
 	public static const listCategory:int = 12;
+	public static const focusAreaCategory:int = 13;
 	public static const extensionsCategory:int = 20;
 
 	public static var variableColor:int = 0xEE7D16; // Scratch 1.4: 0xF3761D
 	public static var listColor:int = 0xCC5B22; // Scratch 1.4: 0xD94D11
 	public static var procedureColor:int = 0x632D99; // 0x531E99;
 	public static var parameterColor:int = 0x5947B1;
+	public static var focusAreaColor:int = 0x000;
 	public static var extensionsColor:int = 0x4B4A60; // 0x72228C; // 0x672D79;
-
+	
 	private static const undefinedColor:int = 0xD42828;
 
 	public static const categories:Array = [
@@ -72,6 +75,7 @@ public class Specs {
 		[10, "More Blocks",	procedureColor],
 		[11, "Parameter",	parameterColor],
 		[12, "List",		listColor],
+		[13, "Focus Area",	focusAreaColor],
 		[20, "Extension",	extensionsColor],
 	];
 
@@ -359,6 +363,9 @@ public class Specs {
 		["-"],
 		["show list %m.list",								" ", 12, "showList:"],
 		["hide list %m.list",								" ", 12, "hideList:"],
+		
+		// DevPro blocks
+		["Focus Area %n",						"c", 13, "focusArea", 1],
 
 		// obsolete blocks from Scratch 1.4 that may be used in older projects
 		["play drum %n for %n beats",			" ", 98, "drum:duration:elapsed:from:", 1, 0.25], // Scratch 1.4 MIDI drum

src/blocks/Block.as

@@ -31,19 +31,33 @@
 // sequence from a specification string (e.g. "%n + %n") and type (e.g. reporter).
 
 package blocks {
+import flash.display.DisplayObject;
+import flash.display.DisplayObjectContainer;
+import flash.display.Sprite;
+import flash.events.FocusEvent;
+import flash.events.MouseEvent;
+import flash.filters.GlowFilter;
+import flash.geom.Point;
+import flash.net.URLLoader;
+import flash.text.AntiAliasType;
+import flash.text.TextField;
+import flash.text.TextFieldAutoSize;
+import flash.text.TextFormat;
+import flash.text.TextLineMetrics;
+
+import assets.Resources;
+
 import extensions.ExtensionManager;
 
-import flash.display.*;
-	import flash.events.*;
-	import flash.filters.GlowFilter;
-	import flash.geom.*;
-	import flash.net.URLLoader;
-	import flash.text.*;
-	import assets.Resources;
-	import translation.Translator;
-	import util.*;
-	import uiwidgets.*;
-	import scratch.*;
+import scratch.ScratchComment;
+import scratch.ScratchStage;
+
+import translation.Translator;
+
+import uiwidgets.DialogBox;
+import uiwidgets.ScriptsPane;
+
+import util.ReadStream;
 
 public class Block extends Sprite {
 
@@ -105,6 +119,9 @@ public class Block extends Sprite {
 
 	private var originalParent:DisplayObjectContainer, originalRole:int, originalIndex:int, originalPosition:Point;
 
+	// For Game Snap
+	public var isGlobal:Boolean = false;
+	
 	public function Block(spec:String, type:String = " ", color:int = 0xD00000, op:* = 0, defaultArgs:Array = null) {
 		this.spec = Translator.map(spec);
 		this.type = type;
@@ -539,6 +556,10 @@ public class Block extends Sprite {
 		dup.parameterNames = parameterNames;
 		dup.defaultArgValues = defaultArgValues;
 		dup.warpProcFlag = warpProcFlag;
+		
+		// For Game Snap
+		dup.isGlobal = isGlobal;
+		
 		if (forClone) {
 			dup.copyArgsForClone(args);
 		} else {

src/blocks/BlockIO.as

@@ -70,8 +70,8 @@ public class BlockIO {
 		if (b.op == Specs.GET_LIST) return [Specs.GET_LIST, b.spec];	// list reporter
 		if (b.op == Specs.GET_PARAM) return [Specs.GET_PARAM, b.spec, b.type]; // parameter reporter
 		if (b.op == Specs.PROCEDURE_DEF)								// procedure definition
-			return [Specs.PROCEDURE_DEF, b.spec, b.parameterNames, b.defaultArgValues, b.warpProcFlag];
-		if (b.op == Specs.CALL) result = [Specs.CALL, b.spec];			// procedure call - arguments follow spec
+			return [Specs.PROCEDURE_DEF, b.spec, b.parameterNames, b.defaultArgValues, b.warpProcFlag, b.isGlobal];		// For Game Snap, isGlobal added with file version 1
+		if (b.op == Specs.CALL) result = [Specs.CALL, b.isGlobal, b.spec];			// procedure call - arguments follow spec.  For Game Snap, isGlobal added with file version 1
 		for each (var a:* in b.normalizedArgs()) {
 			// Note: arguments are always saved in normalized (i.e. left-to-right) order
 			if (a is Block) result.push(blockToArray(a));
@@ -102,8 +102,18 @@ public class BlockIO {
 		if (b) { b.fixArgLayout(); return b }
 
 		if (cmd[0] == Specs.CALL) {
-			b = new Block(cmd[1], '', Specs.procedureColor, Specs.CALL);
-			cmd.splice(0, 1);
+			// Modified for Game Snap
+			if(Scratch.app.gameSnapLastReadFileVersion >= 1) {
+				// Read in the block while taking into account the isGlobal property
+				b = new Block(cmd[2], '', Specs.procedureColor, Specs.CALL);
+				b.isGlobal = cmd[1];
+				cmd.splice(0, 2);
+			}
+			else {
+				// This is the original code that was here.  It allows for reading of non-Game Snap files
+				b = new Block(cmd[1], '', Specs.procedureColor, Specs.CALL);
+				cmd.splice(0, 1);
+			}
 		} else {
 			var spec:Array = specForCmd(cmd, undefinedBlockType);
 			var label:String = spec[0];
@@ -192,6 +202,12 @@ public class BlockIO {
 			b.parameterNames = cmd[2];
 			b.defaultArgValues = cmd[3];
 			if (cmd.length > 4) b.warpProcFlag = cmd[4];
+			
+			// For Game Snap
+			if(Scratch.app.gameSnapLastReadFileVersion >=1 ) {
+				b.isGlobal = cmd[5]; // Defined in blockToArray()
+			}
+			
 			b.setSpec(cmd[1]);
 			b.fixArgLayout();
 			return b;