Skip to content

Commit d30ca44

Browse files
JujuAdamsJujuAdams
committed
Remove convex normal push-out, it wasn't doing anything
1 parent aead53f commit d30ca44

File tree

4 files changed

+44
-44
lines changed

4 files changed

+44
-44
lines changed

‎Clean Shapes.yyp

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/CleanConvex/CleanConvex.gml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,13 @@ function __CleanClassConvex(_array) constructor
241241
_ny2 = _tmp*_n;
242242
_ds2 = dot_product(_x2, _y2, _nx2, _ny2);
243243

244-
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
245-
vertex_position_3d(_vbuff, _x01 - _nx1, _y01 - _ny1, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
246-
vertex_position_3d(_vbuff, _x1 - (_nx1 + _nx2), _y1 - (_ny1 + _ny2), 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
244+
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
245+
vertex_position_3d(_vbuff, _x01, _y01, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
246+
vertex_position_3d(_vbuff, _x1, _y1, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
247247

248-
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
249-
vertex_position_3d(_vbuff, _x1 - (_nx1 + _nx2), _y1 - (_ny1 + _ny2), 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
250-
vertex_position_3d(_vbuff, _x12 - _nx2, _y12 - _ny2, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
248+
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
249+
vertex_position_3d(_vbuff, _x1, _y1, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
250+
vertex_position_3d(_vbuff, _x12, _y12, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
251251

252252
_i = (_i + 2) mod _size;
253253
}
@@ -381,13 +381,13 @@ function __CleanClassConvex(_array) constructor
381381
_border_c12 = merge_colour(_border_c1, _border_c2, 0.5);
382382
_border_a12 = 0.5*(_border_a1 + _border_a2);
383383

384-
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_cc )/255, colour_get_green(_border_cc )/255, colour_get_blue(_border_cc )/255, _border_ac ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
385-
vertex_position_3d(_vbuff, _x01 - _nx1, _y01 - _ny1, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c01)/255, colour_get_green(_border_c01)/255, colour_get_blue(_border_c01)/255, _border_a01); vertex_texcoord(_vbuff, _rounding, _borderThickness);
386-
vertex_position_3d(_vbuff, _x1 - (_nx1 + _nx2), _y1 - (_ny1 + _ny2), 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c1 )/255, colour_get_green(_border_c1 )/255, colour_get_blue(_border_c1 )/255, _border_a1 ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
384+
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_cc )/255, colour_get_green(_border_cc )/255, colour_get_blue(_border_cc )/255, _border_ac ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
385+
vertex_position_3d(_vbuff, _x01, _y01, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c01)/255, colour_get_green(_border_c01)/255, colour_get_blue(_border_c01)/255, _border_a01); vertex_texcoord(_vbuff, _rounding, _borderThickness);
386+
vertex_position_3d(_vbuff, _x1, _y1, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c1 )/255, colour_get_green(_border_c1 )/255, colour_get_blue(_border_c1 )/255, _border_a1 ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
387387

388-
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_cc )/255, colour_get_green(_border_cc )/255, colour_get_blue(_border_cc )/255, _border_ac ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
389-
vertex_position_3d(_vbuff, _x1 - (_nx1 + _nx2), _y1 - (_ny1 + _ny2), 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c1 )/255, colour_get_green(_border_c1 )/255, colour_get_blue(_border_c1 )/255, _border_a1 ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
390-
vertex_position_3d(_vbuff, _x12 - _nx2, _y12 - _ny2, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c12)/255, colour_get_green(_border_c12)/255, colour_get_blue(_border_c12)/255, _border_a12); vertex_texcoord(_vbuff, _rounding, _borderThickness);
388+
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_cc )/255, colour_get_green(_border_cc )/255, colour_get_blue(_border_cc )/255, _border_ac ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
389+
vertex_position_3d(_vbuff, _x1, _y1, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c1 )/255, colour_get_green(_border_c1 )/255, colour_get_blue(_border_c1 )/255, _border_a1 ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
390+
vertex_position_3d(_vbuff, _x12, _y12, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _colour, _alpha); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c12)/255, colour_get_green(_border_c12)/255, colour_get_blue(_border_c12)/255, _border_a12); vertex_texcoord(_vbuff, _rounding, _borderThickness);
391391

392392
_i = (_i + 2) mod _size;
393393
}
@@ -511,13 +511,13 @@ function __CleanClassConvex(_array) constructor
511511
_ny2 = _tmp*_n;
512512
_ds2 = dot_product(_x2, _y2, _nx2, _ny2);
513513

514-
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _cc , _ac ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
515-
vertex_position_3d(_vbuff, _x01 - _nx1, _y01 - _ny1, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c01, _a01); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
516-
vertex_position_3d(_vbuff, _x1 - (_nx1 + _nx2), _y1 - (_ny1 + _ny2), 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c1 , _a1 ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
514+
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _cc, _ac ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
515+
vertex_position_3d(_vbuff, _x01, _y01, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c01, _a01); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
516+
vertex_position_3d(_vbuff, _x1, _y1, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c1, _a1 ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
517517

518-
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _cc , _ac ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
519-
vertex_position_3d(_vbuff, _x1 - (_nx1 + _nx2), _y1 - (_ny1 + _ny2), 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c1 , _a1 ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
520-
vertex_position_3d(_vbuff, _x12 - _nx2, _y12 - _ny2, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c12, _a12); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
518+
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _cc, _ac ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
519+
vertex_position_3d(_vbuff, _x1, _y1, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c1, _a1 ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
520+
vertex_position_3d(_vbuff, _x12, _y12, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c12, _a12); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, _border_r, _border_g, _border_b, _border_a); vertex_texcoord(_vbuff, _rounding, _borderThickness);
521521

522522
_i = (_i + 2) mod _size;
523523
}
@@ -686,13 +686,13 @@ function __CleanClassConvex(_array) constructor
686686
_border_c12 = merge_colour(_border_c1, _border_c2, 0.5);
687687
_border_a12 = 0.5*(_border_a1 + _border_a2);
688688

689-
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _cc , _ac ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_cc )/255, colour_get_green(_border_cc )/255, colour_get_blue(_border_cc )/255, _border_ac ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
690-
vertex_position_3d(_vbuff, _x01 - _nx1, _y01 - _ny1, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c01, _a01); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c01)/255, colour_get_green(_border_c01)/255, colour_get_blue(_border_c01)/255, _border_a01); vertex_texcoord(_vbuff, _rounding, _borderThickness);
691-
vertex_position_3d(_vbuff, _x1 - (_nx1 + _nx2), _y1 - (_ny1 + _ny2), 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c1 , _a1 ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c1 )/255, colour_get_green(_border_c1 )/255, colour_get_blue(_border_c1 )/255, _border_a1 ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
689+
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _cc, _ac ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_cc )/255, colour_get_green(_border_cc )/255, colour_get_blue(_border_cc )/255, _border_ac ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
690+
vertex_position_3d(_vbuff, _x01, _y01, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c01, _a01); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c01)/255, colour_get_green(_border_c01)/255, colour_get_blue(_border_c01)/255, _border_a01); vertex_texcoord(_vbuff, _rounding, _borderThickness);
691+
vertex_position_3d(_vbuff, _x1, _y1, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c1, _a1 ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c1 )/255, colour_get_green(_border_c1 )/255, colour_get_blue(_border_c1 )/255, _border_a1 ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
692692

693-
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _cc , _ac ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_cc )/255, colour_get_green(_border_cc )/255, colour_get_blue(_border_cc )/255, _border_ac ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
694-
vertex_position_3d(_vbuff, _x1 - (_nx1 + _nx2), _y1 - (_ny1 + _ny2), 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c1 , _a1 ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c1 )/255, colour_get_green(_border_c1 )/255, colour_get_blue(_border_c1 )/255, _border_a1 ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
695-
vertex_position_3d(_vbuff, _x12 - _nx2, _y12 - _ny2, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c12, _a12); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c12)/255, colour_get_green(_border_c12)/255, colour_get_blue(_border_c12)/255, _border_a12); vertex_texcoord(_vbuff, _rounding, _borderThickness);
693+
vertex_position_3d(_vbuff, _cx, _cy, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _cc, _ac ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_cc )/255, colour_get_green(_border_cc )/255, colour_get_blue(_border_cc )/255, _border_ac ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
694+
vertex_position_3d(_vbuff, _x1, _y1, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c1, _a1 ); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c1 )/255, colour_get_green(_border_c1 )/255, colour_get_blue(_border_c1 )/255, _border_a1 ); vertex_texcoord(_vbuff, _rounding, _borderThickness);
695+
vertex_position_3d(_vbuff, _x12, _y12, 6); vertex_normal(_vbuff, _nx1, _ny1, _ds1); vertex_colour(_vbuff, _c12, _a12); vertex_float3(_vbuff, _nx2, _ny2, _ds2); vertex_float4(_vbuff, colour_get_red(_border_c12)/255, colour_get_green(_border_c12)/255, colour_get_blue(_border_c12)/255, _border_a12); vertex_texcoord(_vbuff, _rounding, _borderThickness);
696696

697697
_i = (_i + 2) mod _size;
698698
}

0 commit comments

Comments
 (0)