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

images use proper rect

Browse source
This commit is contained in:
John Alanbrook 2024-10-17 22:59:59 -05:00
parent 151891f50f
commit 12bb5e084a
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
scripts/prosperon.js
View file

@ -203,17 +203,17 @@ image.dimensions = function()
texture_proto.copy = function(src, pos, rect) texture_proto.copy = function(src, pos, rect)
{ {
var pixel_rect = { var pixel_rect = {
x: rect[0]*src.width, x: rect.x*src.width,
y: rect[1]*src.height, y: rect.y*src.height,
w: rect[2]*src.width, width: rect.width*src.width,
h: rect[3]*src.height height: rect.height*src.height
}; };
this.blit(src, { this.blit(src, {
x: pos[0], x: pos[0],
y: pos[1], y: pos[1],
w: rect[2]*src.width, width: rect.width*src.width,
h: rect[3]*src.height height: rect.height*src.height
}, pixel_rect, false); }, pixel_rect, false);
} }
@ -224,9 +224,9 @@ var sheetsize = 1024;
function pack_into_sheet(images) function pack_into_sheet(images)
{ {
if (!Array.isArray(images)) images = [images]; if (!Array.isArray(images)) images = [images];
if (images[0].texture.width > 1 && images[0].texture.height > 1) return; if (images[0].texture.width > 300 && images[0].texture.height > 300) return;
sheet_frames = sheet_frames.concat(images); sheet_frames = sheet_frames.concat(images);
var sizes = sheet_frames.map(x => [x.rect[2]*x.texture.width, x.rect[3]*x.texture.height]); var sizes = sheet_frames.map(x => [x.rect.width*x.texture.width, x.rect.height*x.texture.height]);
var pos = os.rectpack(sheetsize, sheetsize, sizes); var pos = os.rectpack(sheetsize, sheetsize, sizes);
if (!pos) { if (!pos) {
console.error(`did not make spritesheet properly from images ${images}`); console.error(`did not make spritesheet properly from images ${images}`);
@ -241,10 +241,10 @@ function pack_into_sheet(images)
newsheet.copy(sheet_frames[i].texture, pos[i], sheet_frames[i].rect); newsheet.copy(sheet_frames[i].texture, pos[i], sheet_frames[i].rect);
// Update the frame's rect to the new position in normalized coordinates // Update the frame's rect to the new position in normalized coordinates
sheet_frames[i].rect[0] = pos[i][0] / newsheet.width; sheet_frames[i].rect.x = pos[i][0] / newsheet.width;
sheet_frames[i].rect[1] = pos[i][1] / newsheet.height; sheet_frames[i].rect.y = pos[i][1] / newsheet.height;
sheet_frames[i].rect[2] = sizes[i][0] / newsheet.width; sheet_frames[i].rect.width = sizes[i][0] / newsheet.width;
sheet_frames[i].rect[3] = sizes[i][1] / newsheet.height; sheet_frames[i].rect.height = sizes[i][1] / newsheet.height;
sheet_frames[i].texture = newsheet; sheet_frames[i].texture = newsheet;
} }
@ -272,7 +272,7 @@ game.texture = function (path) {
if (!anim) { if (!anim) {
image = { image = {
texture: tex, texture: tex,
rect:[0,0,1,1] rect:{x:0,y:0,width:1,height:1}
}; };
if (pack_into_sheet([image])) if (pack_into_sheet([image]))
tex = spritesheet; tex = spritesheet;

4
source/engine/jsffi.c
View file

@ -1169,7 +1169,7 @@ JSC_CCALL(render_make_particle_ssbo,
typedef struct sprite_ss { typedef struct sprite_ss {
HMM_Mat4 model; HMM_Mat4 model;
HMM_Vec4 rect; rect rect;
HMM_Vec4 shade; HMM_Vec4 shade;
} sprite_ss; } sprite_ss;
@ -1210,7 +1210,7 @@ JSC_CCALL(render_make_sprite_ssbo,
tr->pos.xy = HMM_AddV2(tr->pos.xy, pos); tr->pos.xy = HMM_AddV2(tr->pos.xy, pos);
ms[i].model = transform2mat(tr); ms[i].model = transform2mat(tr);
ms[i].rect = js2vec4(js_getpropstr(image,"rect")); ms[i].rect = js2rect(js_getpropstr(image,"rect"));
ms[i].shade = js2vec4(js_getpropstr(sub,"shade")); ms[i].shade = js2vec4(js_getpropstr(sub,"shade"));
if (t) if (t)