john/prosperon
1
0
Fork 0
Code Issues Pull requests Actions Releases Activity

Merge branch 'master' into imgui

Browse source 
# Conflicts:
#	scripts/std.js
#	source/engine/jsffi.c
This commit is contained in:
John Alanbrook 2024-07-02 16:21:22 -05:00
parent 3949b33855 32484ac4a0
commit 50386c0e04
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/components.js
View file

@ -93,7 +93,7 @@ var sprite = {
pick() { return this; }, pick() { return this; },
boundingbox() { boundingbox() {
var dim = this.dimensions(); var dim = this.dimensions();
dim = dim.scale(this.gameobject.gscale()); dim = dim.scale(this.gameobject.scale);
var realpos = dim.scale(0.5).add(this.pos); var realpos = dim.scale(0.5).add(this.pos);
return bbox.fromcwh(realpos,dim); return bbox.fromcwh(realpos,dim);
}, },