mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2025-02-11 20:55:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

[Tileset] Add missing tile variants.

Browse source
This commit is contained in:
Tanasart 2025-01-02 15:29:33 +07:00
parent 25184987cc
commit 486e3f5101
2 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
scripts/node_tiler_tileset/node_tiler_tileset.gml
View file

@ -456,16 +456,22 @@ function Node_Tile_Tileset(_x, _y, _group = noone) : Node(_x, _y, _group) constr
selecting_surface_tile = surface_verify(selecting_surface_tile, _sel_sw, _sel_sh);
var _ty = _yy + _tsh + ui(8);
var _th = ui(48);
_h += ui(8) + _th;
var _sx = _x + ui(8);
var _sy = _ty + ui(8);
var _ss = (_th - ui(16)) / _sel_sh;
var _ss = ui(32) / _sel_sh;
var _sw = _ss * _sel_sw;
var _sh = _ss * _sel_sh;
var _vv = [ 0, 0b0011, 0b0010, 0b0001, 0b0100, 0b0111, 0b0110, 0b0101 ];
var p = array_length(_vv)
var _col = max(1, floor((_w - ui(8)) / (_sw + ui(8))));
var _row = brush.brush_width * brush.brush_height == 1? ceil((p + 1) / _col) : 1;
var _th = ui(8) + (_sh + ui(8)) * _row;
_h += ui(8) + _th;
draw_sprite_stretched_ext(THEME.ui_panel_bg, 1, _x, _ty, _w, _th, COLORS.node_composite_bg_blend, 1);
var _shov = _hover && point_in_rectangle(_m[0], _m[1], _sx, _sy, _sx + _sw, _sy + _sh);
@ -496,14 +502,13 @@ function Node_Tile_Tileset(_x, _y, _group = noone) : Node(_x, _y, _group) constr
_sx += _sw + ui(8);
if(brush.brush_width * brush.brush_height != 1)
return _h;
var _bb = brush.brush_indices[0][0];
var _variences = [ 0, 1, 2, 3, 8, 16 ];
if(brush.brush_width * brush.brush_height != 1) return _h;
for( var v = 0, p = array_length(_variences); v < p; v++ ) {
var _var = _variences[v];
var _bb = brush.brush_indices[0][0];
var _vi = 1;
for( var v = 0; v < p; v++ ) {
var _var = _vv[v];
surface_set_shader(selecting_surface, sh_draw_tile_brush, true, BLEND.over);
shader_set_f("index", _bb[0]);
@ -536,6 +541,11 @@ function Node_Tile_Tileset(_x, _y, _group = noone) : Node(_x, _y, _group) constr
_bb[1] = _var;
_sx += _sw + ui(8);
if(++_vi >= _col) {
_sx = _x + ui(8);
_sy += _sh + ui(8);
_vi = 0;
}
}
#endregion

18
shaders/sh_draw_tile_map/sh_draw_tile_map.fsh
View file

@ -42,16 +42,16 @@ void main() {
texTx = vec2(mod(index, tileAmo.x), floor(index / tileAmo.x)) * tileSize;
tileTx = mod(px, tileSize) / tileSize;
float vari = samIdx.g + 0.1;
float mRotation = mod(floor(vari), 4.);
float mFlipH = mod(floor(vari / 8.), 2.);
float mFlipV = mod(floor(vari / 16.), 2.);
float vari = samIdx.g + 0.1;
float mRot = mod(floor(vari), 4.);
float mFlipH = mod(floor(vari / 4.), 2.);
float mFlipV = mod(floor(vari / 8.), 2.);
if(mFlipH == 1.) tileTx.x = 1. - tileTx.x;
if(mFlipV == 1.) tileTx.y = 1. - tileTx.y;
if(mRotation == 1.) tileTx = vec2(tileTx.y, 1. - tileTx.x);
if(mRotation == 2.) tileTx = 1. - tileTx;
if(mRotation == 3.) tileTx = vec2(1. - tileTx.y, tileTx.x);
if(mFlipH == 1.) tileTx.x = 1. - tileTx.x;
if(mFlipV == 1.) tileTx.y = 1. - tileTx.y;
if(mRot == 1.) tileTx = vec2(tileTx.y, 1. - tileTx.x);
if(mRot == 2.) tileTx = 1. - tileTx;
if(mRot == 3.) tileTx = vec2(1. - tileTx.y, tileTx.x);
vec2 samTx = texTx + tileTx * tileSize;
gl_FragColor = texture2D( tileTexture, samTx / tileTextureDim );