Skip to content
This repository has been archived by the owner on Sep 3, 2019. It is now read-only.

Commit

Permalink
Merge pull request #487 from LLK/v424
Browse files Browse the repository at this point in the history
v424
  • Loading branch information
cwillisf committed Sep 12, 2014
2 parents ce50067 + b90b814 commit d966f1a
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 3 deletions.
22 changes: 20 additions & 2 deletions src/scratch/ScratchCostume.as
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class ScratchCostume {
public var baseLayerBitmap:BitmapData;
public var baseLayerID:int = -1;
public var baseLayerMD5:String;
public var baseLayerData:ByteArray;
private var __baseLayerData:ByteArray;

public static const WasEdited:int = -10; // special baseLayerID used to indicate costumes that have been edited

Expand All @@ -74,7 +74,7 @@ public class ScratchCostume {
public var textLayerBitmap:BitmapData;
public var textLayerID:int = -1;
public var textLayerMD5:String;
public var textLayerData:ByteArray;
private var __textLayerData:ByteArray;

public var text:String;
public var textRect:Rectangle;
Expand Down Expand Up @@ -103,6 +103,24 @@ public class ScratchCostume {
}
}

public function get baseLayerData():ByteArray {
return __baseLayerData;
}

public function set baseLayerData(data:ByteArray):void {
__baseLayerData = data;
baseLayerMD5 = null;
}

public function get textLayerData():ByteArray {
return __textLayerData;
}

public function set textLayerData(data:ByteArray):void {
__textLayerData = data;
textLayerMD5 = null;
}

public static function scaleForScratch(bm:BitmapData):BitmapData {
if ((bm.width <= 480) && (bm.height <= 360)) return bm;
var scale:Number = Math.min(480 / bm.width, 360 / bm.height);
Expand Down
11 changes: 10 additions & 1 deletion src/scratch/ScratchSound.as
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class ScratchSound {
public var soundName:String = '';
public var soundID:int;
public var md5:String;
public var soundData:ByteArray = new ByteArray();
private var __soundData:ByteArray = new ByteArray();
public var format:String = '';
public var rate:int = 44100;
public var sampleCount:int;
Expand Down Expand Up @@ -71,6 +71,15 @@ public class ScratchSound {
}
}

public function get soundData():ByteArray {
return __soundData;
}

public function set soundData(data:ByteArray):void {
__soundData = data;
md5 = null;
}

private function reduceSizeIfNeeded(channels:int):void {
// Convert stereo to mono, downsample if rate > 32000, or both.
// Compress if data is over threshold and not already compressed.
Expand Down

0 comments on commit d966f1a

Please sign in to comment.