kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

more dramatically scaled jigsaw geometry for all image sizes

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-08-10 18:19:24 +00:00
parent 3c708cd6f6
commit 4a7094faba
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/flixel-desktop-habit-puzzle-game/source/HabitState.hx
View File

@@ -41,9 +41,9 @@ import jigsawx.math.Vec2;
@:build(kiss.Kiss.build()) @:build(kiss.Kiss.build())
class HabitState extends FlxState { class HabitState extends FlxState {
public function drawPieceShape( surface: FlxSprite, jig: JigsawPiece, c: FlxColor ) public function drawPieceShape( surface: FlxSprite, jig: JigsawPiece, scale:Float, c: FlxColor )
{ {
var points = [for (point in jig.getPoints()) new FlxPoint(point.x, point.y)]; var points = [for (point in jig.getPoints()) new FlxPoint(point.x / scale, point.y / scale)];
points.push(points[0]); points.push(points[0]);
FlxSpriteUtil.drawPolygon( FlxSpriteUtil.drawPolygon(
surface, surface,

25
projects/flixel-desktop-habit-puzzle-game/source/HabitState.kiss
View File

@@ -104,8 +104,8 @@
(prop &mut :HabitModel model null) (prop &mut :HabitModel model null)
(method scaledToTheImageThatWorkedNice [v] (method roughOptimalScale []
~(* v (/ (smallerDimension) 367))) (/ 367 (smallerDimension)))
(method smallerDimension [] (min rewardSprite.pixels.width rewardSprite.pixels.height)) (method smallerDimension [] (min rewardSprite.pixels.width rewardSprite.pixels.height))
// TODO these variables don't do exactly what I think they do when scaled, like at all: // TODO these variables don't do exactly what I think they do when scaled, like at all:
(defAlias &ident EDGE_LEEWAY 25) (defAlias &ident EDGE_LEEWAY 25)
@@ -193,8 +193,9 @@
(indexMap.clear) (indexMap.clear)
(let [r (new FlxRandom (Strings.hashCode currentRewardFile.path)) (let [r (new FlxRandom (Strings.hashCode currentRewardFile.path))
graphicWidth rewardSprite.pixels.width ros (roughOptimalScale)
graphicHeight rewardSprite.pixels.height graphicWidth (* ros rewardSprite.pixels.width)
graphicHeight (* ros rewardSprite.pixels.height)
pieceAssetWidth (/ (- graphicWidth (* EDGE_LEEWAY 2)) PUZZLE_WIDTH) pieceAssetWidth (/ (- graphicWidth (* EDGE_LEEWAY 2)) PUZZLE_WIDTH)
pieceAssetHeight (/ (- graphicHeight (* EDGE_LEEWAY 2)) PUZZLE_HEIGHT) pieceAssetHeight (/ (- graphicHeight (* EDGE_LEEWAY 2)) PUZZLE_HEIGHT)
j (new Jigsawx pieceAssetWidth pieceAssetHeight graphicWidth graphicHeight EDGE_LEEWAY BUBBLE_SIZE PUZZLE_HEIGHT PUZZLE_WIDTH r) j (new Jigsawx pieceAssetWidth pieceAssetHeight graphicWidth graphicHeight EDGE_LEEWAY BUBBLE_SIZE PUZZLE_HEIGHT PUZZLE_WIDTH r)
@@ -222,7 +223,7 @@
s (new KissExtendedSprite pos.x pos.y) s (new KissExtendedSprite pos.x pos.y)
source (new FlxSprite) source (new FlxSprite)
mask (new FlxSprite) mask (new FlxSprite)
sourceRect (new Rectangle jig.xy.x jig.xy.y jig.wh.x jig.wh.y)] sourceRect (new Rectangle (/ jig.xy.x ros) (/ jig.xy.y ros) (/ jig.wh.x ros) (/ jig.wh.y ros))]
(set s.priorityID i) (set s.priorityID i)
(setNth spriteGrid jig.row jig.col s) (setNth spriteGrid jig.row jig.col s)
(setNth indexGrid jig.row jig.col i) (setNth indexGrid jig.row jig.col i)
@@ -258,7 +259,7 @@
(source.pixels.copyPixels rewardSprite.pixels sourceRect (new Point 0 0)) (source.pixels.copyPixels rewardSprite.pixels sourceRect (new Point 0 0))
(mask.makeGraphic (Std.int sourceRect.width) (Std.int sourceRect.height) FlxColor.TRANSPARENT true) (mask.makeGraphic (Std.int sourceRect.width) (Std.int sourceRect.height) FlxColor.TRANSPARENT true)
(drawPieceShape mask jig FlxColor.BLACK) (drawPieceShape mask jig ros FlxColor.BLACK)
(FlxSpriteUtil.alphaMask s source.pixels mask.pixels) (FlxSpriteUtil.alphaMask s source.pixels mask.pixels)
(set s.cameras [pieceCamera]) (set s.cameras [pieceCamera])
@@ -361,17 +362,17 @@
(-= text.x text.width) (-= text.x text.width)
(logTexts.add text)))) (logTexts.add text))))
// TODO properly tune the match zones to bubbles
(method :FlxRect matchZone [:KissExtendedSprite s compass] (method :FlxRect matchZone [:KissExtendedSprite s compass]
(let [bubblePoints (dictGet .bubblePoints (dictGet pieceData (dictGet indexMap s)) compass)] (let [bubblePoints (dictGet .bubblePoints (dictGet pieceData (dictGet indexMap s)) compass)]
(unless bubblePoints (unless bubblePoints
(return (new FlxRect 0 0 0 0))) (return (new FlxRect 0 0 0 0)))
(let [pointsX (for point bubblePoints point.x) (let [ros (roughOptimalScale)
pointsX (for point bubblePoints point.x)
pointsY (for point bubblePoints point.y) pointsY (for point bubblePoints point.y)
minX (apply min pointsX) minX (/ (apply min pointsX) ros)
minY (apply min pointsY) minY (/ (apply min pointsY) ros)
maxX (apply max pointsX) maxX (/ (apply max pointsX) ros)
maxY (apply max pointsY) maxY (/ (apply max pointsY) ros)
rect (.fromTwoPoints (new FlxRect) (new FlxPoint minX minY) (new FlxPoint maxX maxY))] rect (.fromTwoPoints (new FlxRect) (new FlxPoint minX minY) (new FlxPoint maxX maxY))]
(+= rect.x s.x) (+= rect.x s.x)
(+= rect.y s.y) (+= rect.y s.y)