Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-14 19:25:16 -05:00
Code Issues Projects Releases Packages Wiki Activity

pixel perfect mouse check rather than hitbox

Browse source
This commit is contained in:
Cameron Taylor 2024-09-30 19:15:03 -04:00
parent 623985a2cc
commit 8890cbf270
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/funkin/ui/debug/stageeditor/StageEditorObject.hx
View file

@ -50,7 +50,7 @@ class StageEditorObject extends FunkinSprite
return value; return value;
} }
public function playAnim(name:String, restart:Bool = false, reversed:Bool = false) public function playAnim(name:String, restart:Bool = false, reversed:Bool = false):Void
{ {
if (!animation.getNameList().contains(name)) return; if (!animation.getNameList().contains(name)) return;
@ -71,7 +71,7 @@ class StageEditorObject extends FunkinSprite
*/ */
var _danced:Bool = true; var _danced:Bool = true;
public function dance(restart:Bool = false) public function dance(restart:Bool = false):Void
{ {
if (isDebugged) return; if (isDebugged) return;

22
source/funkin/ui/debug/stageeditor/StageEditorState.hx
View file

@ -181,7 +181,7 @@ class StageEditorState extends UIState
public var saved(default, set):Bool = true; public var saved(default, set):Bool = true;
public var currentFile(default, set):String = ""; public var currentFile(default, set):String = "";
function set_saved(value:Bool) function set_saved(value:Bool):Bool
{ {
saved = value; saved = value;
@ -216,7 +216,7 @@ class StageEditorState extends UIState
return value; return value;
} }
function set_currentFile(value:String) function set_currentFile(value:String):String
{ {
currentFile = value; currentFile = value;
@ -278,7 +278,7 @@ class StageEditorState extends UIState
var showChars(default, set):Bool = true; var showChars(default, set):Bool = true;
function set_showChars(value:Bool) function set_showChars(value:Bool):Bool
{ {
this.showChars = value; this.showChars = value;
@ -288,7 +288,7 @@ class StageEditorState extends UIState
return value; return value;
} }
override public function create() override public function create():Void
{ {
WindowManager.instance.reset(); WindowManager.instance.reset();
instance = this; instance = this;
@ -619,7 +619,7 @@ class StageEditorState extends UIState
{ {
spr.active = spr.isOnScreen(); spr.active = spr.isOnScreen();
if (FlxG.mouse.overlaps(spr)) if (spr.pixelsOverlapPoint(FlxG.mouse.getWorldPosition()))
{ {
if (spr.visible && !FlxG.keys.pressed.SHIFT) nameTxt.text = spr.name; if (spr.visible && !FlxG.keys.pressed.SHIFT) nameTxt.text = spr.name;
@ -923,7 +923,7 @@ class StageEditorState extends UIState
WindowUtil.setWindowTitle('Friday Night Funkin\''); WindowUtil.setWindowTitle('Friday Night Funkin\'');
} }
function updateBGColors() function updateBGColors():Void
{ {
var colArray = Save.instance.stageEditorTheme == StageEditorTheme.Dark ? DARK_MODE_COLORS : LIGHT_MODE_COLORS; var colArray = Save.instance.stageEditorTheme == StageEditorTheme.Dark ? DARK_MODE_COLORS : LIGHT_MODE_COLORS;
@ -937,14 +937,14 @@ class StageEditorState extends UIState
members.insert(index, bg); members.insert(index, bg);
} }
function updateBGSize() function updateBGSize():Void
{ {
bg.scale.set(1 / FlxG.camera.zoom, 1 / FlxG.camera.zoom); bg.scale.set(1 / FlxG.camera.zoom, 1 / FlxG.camera.zoom);
bg.updateHitbox(); bg.updateHitbox();
bg.screenCenter(); bg.screenCenter();
} }
function checkOverlaps(spr:FlxSprite) function checkOverlaps(spr:FlxSprite):Bool
{ {
if (FlxG.mouse.overlaps(spr) /*spr.overlapsPoint(FlxG.mouse.getWorldPosition(spr.camera), true, spr.camera) */ if (FlxG.mouse.overlaps(spr) /*spr.overlapsPoint(FlxG.mouse.getWorldPosition(spr.camera), true, spr.camera) */
&& Screen.instance != null && Screen.instance != null
@ -957,7 +957,7 @@ class StageEditorState extends UIState
var sprDependant:Array<MenuItem> = []; var sprDependant:Array<MenuItem> = [];
function addUI() function addUI():Void
{ {
menubarItemNewStage.onClick = function(_) onMenuItemClick("new stage"); menubarItemNewStage.onClick = function(_) onMenuItemClick("new stage");
menubarItemOpenStage.onClick = function(_) onMenuItemClick("open stage"); menubarItemOpenStage.onClick = function(_) onMenuItemClick("open stage");
@ -1065,7 +1065,7 @@ class StageEditorState extends UIState
reloadRecentFiles(); reloadRecentFiles();
} }
function reloadRecentFiles() function reloadRecentFiles():Void
{ {
for (a in menubarItemOpenRecent.childComponents) for (a in menubarItemOpenRecent.childComponents)
menubarItemOpenRecent.removeComponent(a); menubarItemOpenRecent.removeComponent(a);
@ -1114,7 +1114,7 @@ class StageEditorState extends UIState
public var aboutDialog:AboutDialog; public var aboutDialog:AboutDialog;
public var loadUrlDialog:LoadFromUrlDialog; public var loadUrlDialog:LoadFromUrlDialog;
public function onMenuItemClick(item:String) public function onMenuItemClick(item:String):Void
{ {
switch (item.toLowerCase()) switch (item.toLowerCase())
{ {