From 394883bd209e47d7f9df3040be812deeb69b8ba0 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 2 Oct 2025 03:03:32 +0100 Subject: [PATCH 1/2] cata main body shadows --- ChapterMaster.yyp | 9 +- scripts/scr_ComplexSet/scr_ComplexSet.gml | 1 - .../scr_culture_visuals.gml | 7 ++ shaders/Shader11/Shader11.fsh | 10 ++ shaders/Shader11/Shader11.vsh | 19 ++++ shaders/Shader11/Shader11.yy | 12 +++ shaders/Shader12/Shader12.fsh | 10 ++ shaders/Shader12/Shader12.vsh | 19 ++++ shaders/Shader12/Shader12.yy | 12 +++ shaders/Shader13/Shader13.fsh | 10 ++ shaders/Shader13/Shader13.vsh | 19 ++++ shaders/Shader13/Shader13.yy | 12 +++ shaders/Shader14/Shader14.fsh | 10 ++ shaders/Shader14/Shader14.vsh | 19 ++++ shaders/Shader14/Shader14.yy | 12 +++ shaders/Shader15/Shader15.fsh | 10 ++ shaders/Shader15/Shader15.vsh | 19 ++++ shaders/Shader15/Shader15.yy | 12 +++ shaders/Shader16/Shader16.fsh | 10 ++ shaders/Shader16/Shader16.vsh | 19 ++++ shaders/Shader16/Shader16.yy | 12 +++ .../548e11a0-6b13-4fa6-93be-4121736d914f.png | Bin 0 -> 6390 bytes .../229b5182-d233-4896-9f67-630367846af5.png | Bin 0 -> 6390 bytes .../spr_tartaros_shadows.yy | 92 ++++++++++++++++++ 24 files changed, 353 insertions(+), 2 deletions(-) create mode 100644 shaders/Shader11/Shader11.fsh create mode 100644 shaders/Shader11/Shader11.vsh create mode 100644 shaders/Shader11/Shader11.yy create mode 100644 shaders/Shader12/Shader12.fsh create mode 100644 shaders/Shader12/Shader12.vsh create mode 100644 shaders/Shader12/Shader12.yy create mode 100644 shaders/Shader13/Shader13.fsh create mode 100644 shaders/Shader13/Shader13.vsh create mode 100644 shaders/Shader13/Shader13.yy create mode 100644 shaders/Shader14/Shader14.fsh create mode 100644 shaders/Shader14/Shader14.vsh create mode 100644 shaders/Shader14/Shader14.yy create mode 100644 shaders/Shader15/Shader15.fsh create mode 100644 shaders/Shader15/Shader15.vsh create mode 100644 shaders/Shader15/Shader15.yy create mode 100644 shaders/Shader16/Shader16.fsh create mode 100644 shaders/Shader16/Shader16.vsh create mode 100644 shaders/Shader16/Shader16.yy create mode 100644 sprites/spr_tartaros_shadows/548e11a0-6b13-4fa6-93be-4121736d914f.png create mode 100644 sprites/spr_tartaros_shadows/layers/548e11a0-6b13-4fa6-93be-4121736d914f/229b5182-d233-4896-9f67-630367846af5.png create mode 100644 sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index b8e0558769..8ef7776bce 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -576,7 +576,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.892", + "IDEVersion":"2024.1400.0.901", }, "name":"ChapterMaster", "resources":[ @@ -968,6 +968,12 @@ {"id":{"name":"light_dark_shader","path":"shaders/light_dark_shader/light_dark_shader.yy",},}, {"id":{"name":"reverse_draw_shader","path":"shaders/reverse_draw_shader/reverse_draw_shader.yy",},}, {"id":{"name":"right_left_swap_shader","path":"shaders/right_left_swap_shader/right_left_swap_shader.yy",},}, + {"id":{"name":"Shader11","path":"shaders/Shader11/Shader11.yy",},}, + {"id":{"name":"Shader12","path":"shaders/Shader12/Shader12.yy",},}, + {"id":{"name":"Shader13","path":"shaders/Shader13/Shader13.yy",},}, + {"id":{"name":"Shader14","path":"shaders/Shader14/Shader14.yy",},}, + {"id":{"name":"Shader15","path":"shaders/Shader15/Shader15.yy",},}, + {"id":{"name":"Shader16","path":"shaders/Shader16/Shader16.yy",},}, {"id":{"name":"shd_multiply_blend","path":"shaders/shd_multiply_blend/shd_multiply_blend.yy",},}, {"id":{"name":"Ship_shader","path":"shaders/Ship_shader/Ship_shader.yy",},}, {"id":{"name":"skin_tone_shader","path":"shaders/skin_tone_shader/skin_tone_shader.yy",},}, @@ -1648,6 +1654,7 @@ {"id":{"name":"spr_tartaros_right_arm","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},}, {"id":{"name":"spr_tartaros_right_leg","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},}, {"id":{"name":"spr_tartaros_right_trim","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},}, + {"id":{"name":"spr_tartaros_shadows","path":"sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy",},}, {"id":{"name":"spr_tartaros_wep_fix","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},}, {"id":{"name":"spr_tartaros2_colors","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},}, {"id":{"name":"spr_tech_area_pad","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},}, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index f036f64a59..6edf1a1ae4 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -1342,7 +1342,6 @@ function ComplexSet(_unit) constructor { break; case "Tartaros": add_group({ - armour: spr_tartaros_complex, left_arm: spr_tartaros_left_arm, right_arm: spr_tartaros_right_arm, right_leg: spr_tartaros_right_leg, diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 54ed91f3c9..5205f6f6da 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1427,6 +1427,13 @@ global.modular_drawing_items = [ shadows : spr_mk7_right_arm_shadow, body_types : [0], flip : true, + }, + { + position : "armour", + armours : ["Tartaros"], + sprite : spr_tartaros_complex, + shadows : spr_tartaros_shadows, + body_types : [2], } ]; diff --git a/shaders/Shader11/Shader11.fsh b/shaders/Shader11/Shader11.fsh new file mode 100644 index 0000000000..e28a17897a --- /dev/null +++ b/shaders/Shader11/Shader11.fsh @@ -0,0 +1,10 @@ +// +// Simple passthrough fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); +} diff --git a/shaders/Shader11/Shader11.vsh b/shaders/Shader11/Shader11.vsh new file mode 100644 index 0000000000..3900c20f40 --- /dev/null +++ b/shaders/Shader11/Shader11.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/Shader11/Shader11.yy b/shaders/Shader11/Shader11.yy new file mode 100644 index 0000000000..634b1d6771 --- /dev/null +++ b/shaders/Shader11/Shader11.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"Shader11", + "name":"Shader11", + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/Shader12/Shader12.fsh b/shaders/Shader12/Shader12.fsh new file mode 100644 index 0000000000..e28a17897a --- /dev/null +++ b/shaders/Shader12/Shader12.fsh @@ -0,0 +1,10 @@ +// +// Simple passthrough fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); +} diff --git a/shaders/Shader12/Shader12.vsh b/shaders/Shader12/Shader12.vsh new file mode 100644 index 0000000000..3900c20f40 --- /dev/null +++ b/shaders/Shader12/Shader12.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/Shader12/Shader12.yy b/shaders/Shader12/Shader12.yy new file mode 100644 index 0000000000..8c9d6eeee7 --- /dev/null +++ b/shaders/Shader12/Shader12.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"Shader12", + "name":"Shader12", + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/Shader13/Shader13.fsh b/shaders/Shader13/Shader13.fsh new file mode 100644 index 0000000000..e28a17897a --- /dev/null +++ b/shaders/Shader13/Shader13.fsh @@ -0,0 +1,10 @@ +// +// Simple passthrough fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); +} diff --git a/shaders/Shader13/Shader13.vsh b/shaders/Shader13/Shader13.vsh new file mode 100644 index 0000000000..3900c20f40 --- /dev/null +++ b/shaders/Shader13/Shader13.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/Shader13/Shader13.yy b/shaders/Shader13/Shader13.yy new file mode 100644 index 0000000000..99becf4f6b --- /dev/null +++ b/shaders/Shader13/Shader13.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"Shader13", + "name":"Shader13", + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/Shader14/Shader14.fsh b/shaders/Shader14/Shader14.fsh new file mode 100644 index 0000000000..e28a17897a --- /dev/null +++ b/shaders/Shader14/Shader14.fsh @@ -0,0 +1,10 @@ +// +// Simple passthrough fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); +} diff --git a/shaders/Shader14/Shader14.vsh b/shaders/Shader14/Shader14.vsh new file mode 100644 index 0000000000..3900c20f40 --- /dev/null +++ b/shaders/Shader14/Shader14.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/Shader14/Shader14.yy b/shaders/Shader14/Shader14.yy new file mode 100644 index 0000000000..454d01cfc4 --- /dev/null +++ b/shaders/Shader14/Shader14.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"Shader14", + "name":"Shader14", + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/Shader15/Shader15.fsh b/shaders/Shader15/Shader15.fsh new file mode 100644 index 0000000000..e28a17897a --- /dev/null +++ b/shaders/Shader15/Shader15.fsh @@ -0,0 +1,10 @@ +// +// Simple passthrough fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); +} diff --git a/shaders/Shader15/Shader15.vsh b/shaders/Shader15/Shader15.vsh new file mode 100644 index 0000000000..3900c20f40 --- /dev/null +++ b/shaders/Shader15/Shader15.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/Shader15/Shader15.yy b/shaders/Shader15/Shader15.yy new file mode 100644 index 0000000000..89f77e8d30 --- /dev/null +++ b/shaders/Shader15/Shader15.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"Shader15", + "name":"Shader15", + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/shaders/Shader16/Shader16.fsh b/shaders/Shader16/Shader16.fsh new file mode 100644 index 0000000000..e28a17897a --- /dev/null +++ b/shaders/Shader16/Shader16.fsh @@ -0,0 +1,10 @@ +// +// Simple passthrough fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); +} diff --git a/shaders/Shader16/Shader16.vsh b/shaders/Shader16/Shader16.vsh new file mode 100644 index 0000000000..3900c20f40 --- /dev/null +++ b/shaders/Shader16/Shader16.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/Shader16/Shader16.yy b/shaders/Shader16/Shader16.yy new file mode 100644 index 0000000000..6a3d6462f4 --- /dev/null +++ b/shaders/Shader16/Shader16.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"Shader16", + "name":"Shader16", + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_shadows/548e11a0-6b13-4fa6-93be-4121736d914f.png b/sprites/spr_tartaros_shadows/548e11a0-6b13-4fa6-93be-4121736d914f.png new file mode 100644 index 0000000000000000000000000000000000000000..1f0e1c8e0351d986a1e7b99bb612d65c37aa1850 GIT binary patch literal 6390 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_tartaros_shadows/layers/548e11a0-6b13-4fa6-93be-4121736d914f/229b5182-d233-4896-9f67-630367846af5.png b/sprites/spr_tartaros_shadows/layers/548e11a0-6b13-4fa6-93be-4121736d914f/229b5182-d233-4896-9f67-630367846af5.png new file mode 100644 index 0000000000000000000000000000000000000000..1f0e1c8e0351d986a1e7b99bb612d65c37aa1850 GIT binary patch literal 6390 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy b/sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy new file mode 100644 index 0000000000..445ab3a2a6 --- /dev/null +++ b/sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_shadows", + "bboxMode":0, + "bbox_bottom":204, + "bbox_left":10, + "bbox_right":169, + "bbox_top":32, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"548e11a0-6b13-4fa6-93be-4121736d914f","name":"548e11a0-6b13-4fa6-93be-4121736d914f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"229b5182-d233-4896-9f67-630367846af5","blendMode":0,"displayName":"default","isLocked":false,"name":"229b5182-d233-4896-9f67-630367846af5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"548e11a0-6b13-4fa6-93be-4121736d914f","path":"sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b2b5bad7-34d4-4dfe-8037-a5bf1df0c661","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":7, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file From 86b0081d181af240fd7f20acdfa726d355522866 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 2 Oct 2025 03:12:59 +0100 Subject: [PATCH 2/2] accifdentalshaders --- ChapterMaster.yyp | 6 ------ shaders/Shader11/Shader11.fsh | 10 ---------- shaders/Shader11/Shader11.vsh | 19 ------------------- shaders/Shader11/Shader11.yy | 12 ------------ shaders/Shader12/Shader12.fsh | 10 ---------- shaders/Shader12/Shader12.vsh | 19 ------------------- shaders/Shader12/Shader12.yy | 12 ------------ shaders/Shader13/Shader13.fsh | 10 ---------- shaders/Shader13/Shader13.vsh | 19 ------------------- shaders/Shader13/Shader13.yy | 12 ------------ shaders/Shader14/Shader14.fsh | 10 ---------- shaders/Shader14/Shader14.vsh | 19 ------------------- shaders/Shader14/Shader14.yy | 12 ------------ shaders/Shader15/Shader15.fsh | 10 ---------- shaders/Shader15/Shader15.vsh | 19 ------------------- shaders/Shader15/Shader15.yy | 12 ------------ shaders/Shader16/Shader16.fsh | 10 ---------- shaders/Shader16/Shader16.vsh | 19 ------------------- shaders/Shader16/Shader16.yy | 12 ------------ 19 files changed, 252 deletions(-) delete mode 100644 shaders/Shader11/Shader11.fsh delete mode 100644 shaders/Shader11/Shader11.vsh delete mode 100644 shaders/Shader11/Shader11.yy delete mode 100644 shaders/Shader12/Shader12.fsh delete mode 100644 shaders/Shader12/Shader12.vsh delete mode 100644 shaders/Shader12/Shader12.yy delete mode 100644 shaders/Shader13/Shader13.fsh delete mode 100644 shaders/Shader13/Shader13.vsh delete mode 100644 shaders/Shader13/Shader13.yy delete mode 100644 shaders/Shader14/Shader14.fsh delete mode 100644 shaders/Shader14/Shader14.vsh delete mode 100644 shaders/Shader14/Shader14.yy delete mode 100644 shaders/Shader15/Shader15.fsh delete mode 100644 shaders/Shader15/Shader15.vsh delete mode 100644 shaders/Shader15/Shader15.yy delete mode 100644 shaders/Shader16/Shader16.fsh delete mode 100644 shaders/Shader16/Shader16.vsh delete mode 100644 shaders/Shader16/Shader16.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 8ef7776bce..76d15b730d 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -968,12 +968,6 @@ {"id":{"name":"light_dark_shader","path":"shaders/light_dark_shader/light_dark_shader.yy",},}, {"id":{"name":"reverse_draw_shader","path":"shaders/reverse_draw_shader/reverse_draw_shader.yy",},}, {"id":{"name":"right_left_swap_shader","path":"shaders/right_left_swap_shader/right_left_swap_shader.yy",},}, - {"id":{"name":"Shader11","path":"shaders/Shader11/Shader11.yy",},}, - {"id":{"name":"Shader12","path":"shaders/Shader12/Shader12.yy",},}, - {"id":{"name":"Shader13","path":"shaders/Shader13/Shader13.yy",},}, - {"id":{"name":"Shader14","path":"shaders/Shader14/Shader14.yy",},}, - {"id":{"name":"Shader15","path":"shaders/Shader15/Shader15.yy",},}, - {"id":{"name":"Shader16","path":"shaders/Shader16/Shader16.yy",},}, {"id":{"name":"shd_multiply_blend","path":"shaders/shd_multiply_blend/shd_multiply_blend.yy",},}, {"id":{"name":"Ship_shader","path":"shaders/Ship_shader/Ship_shader.yy",},}, {"id":{"name":"skin_tone_shader","path":"shaders/skin_tone_shader/skin_tone_shader.yy",},}, diff --git a/shaders/Shader11/Shader11.fsh b/shaders/Shader11/Shader11.fsh deleted file mode 100644 index e28a17897a..0000000000 --- a/shaders/Shader11/Shader11.fsh +++ /dev/null @@ -1,10 +0,0 @@ -// -// Simple passthrough fragment shader -// -varying vec2 v_vTexcoord; -varying vec4 v_vColour; - -void main() -{ - gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); -} diff --git a/shaders/Shader11/Shader11.vsh b/shaders/Shader11/Shader11.vsh deleted file mode 100644 index 3900c20f40..0000000000 --- a/shaders/Shader11/Shader11.vsh +++ /dev/null @@ -1,19 +0,0 @@ -// -// Simple passthrough vertex shader -// -attribute vec3 in_Position; // (x,y,z) -//attribute vec3 in_Normal; // (x,y,z) unused in this shader. -attribute vec4 in_Colour; // (r,g,b,a) -attribute vec2 in_TextureCoord; // (u,v) - -varying vec2 v_vTexcoord; -varying vec4 v_vColour; - -void main() -{ - vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); - gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; - - v_vColour = in_Colour; - v_vTexcoord = in_TextureCoord; -} diff --git a/shaders/Shader11/Shader11.yy b/shaders/Shader11/Shader11.yy deleted file mode 100644 index 634b1d6771..0000000000 --- a/shaders/Shader11/Shader11.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$GMShader":"", - "%Name":"Shader11", - "name":"Shader11", - "parent":{ - "name":"tartaros_complex", - "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", - }, - "resourceType":"GMShader", - "resourceVersion":"2.0", - "type":1, -} \ No newline at end of file diff --git a/shaders/Shader12/Shader12.fsh b/shaders/Shader12/Shader12.fsh deleted file mode 100644 index e28a17897a..0000000000 --- a/shaders/Shader12/Shader12.fsh +++ /dev/null @@ -1,10 +0,0 @@ -// -// Simple passthrough fragment shader -// -varying vec2 v_vTexcoord; -varying vec4 v_vColour; - -void main() -{ - gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); -} diff --git a/shaders/Shader12/Shader12.vsh b/shaders/Shader12/Shader12.vsh deleted file mode 100644 index 3900c20f40..0000000000 --- a/shaders/Shader12/Shader12.vsh +++ /dev/null @@ -1,19 +0,0 @@ -// -// Simple passthrough vertex shader -// -attribute vec3 in_Position; // (x,y,z) -//attribute vec3 in_Normal; // (x,y,z) unused in this shader. -attribute vec4 in_Colour; // (r,g,b,a) -attribute vec2 in_TextureCoord; // (u,v) - -varying vec2 v_vTexcoord; -varying vec4 v_vColour; - -void main() -{ - vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); - gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; - - v_vColour = in_Colour; - v_vTexcoord = in_TextureCoord; -} diff --git a/shaders/Shader12/Shader12.yy b/shaders/Shader12/Shader12.yy deleted file mode 100644 index 8c9d6eeee7..0000000000 --- a/shaders/Shader12/Shader12.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$GMShader":"", - "%Name":"Shader12", - "name":"Shader12", - "parent":{ - "name":"tartaros_complex", - "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", - }, - "resourceType":"GMShader", - "resourceVersion":"2.0", - "type":1, -} \ No newline at end of file diff --git a/shaders/Shader13/Shader13.fsh b/shaders/Shader13/Shader13.fsh deleted file mode 100644 index e28a17897a..0000000000 --- a/shaders/Shader13/Shader13.fsh +++ /dev/null @@ -1,10 +0,0 @@ -// -// Simple passthrough fragment shader -// -varying vec2 v_vTexcoord; -varying vec4 v_vColour; - -void main() -{ - gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); -} diff --git a/shaders/Shader13/Shader13.vsh b/shaders/Shader13/Shader13.vsh deleted file mode 100644 index 3900c20f40..0000000000 --- a/shaders/Shader13/Shader13.vsh +++ /dev/null @@ -1,19 +0,0 @@ -// -// Simple passthrough vertex shader -// -attribute vec3 in_Position; // (x,y,z) -//attribute vec3 in_Normal; // (x,y,z) unused in this shader. -attribute vec4 in_Colour; // (r,g,b,a) -attribute vec2 in_TextureCoord; // (u,v) - -varying vec2 v_vTexcoord; -varying vec4 v_vColour; - -void main() -{ - vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); - gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; - - v_vColour = in_Colour; - v_vTexcoord = in_TextureCoord; -} diff --git a/shaders/Shader13/Shader13.yy b/shaders/Shader13/Shader13.yy deleted file mode 100644 index 99becf4f6b..0000000000 --- a/shaders/Shader13/Shader13.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$GMShader":"", - "%Name":"Shader13", - "name":"Shader13", - "parent":{ - "name":"tartaros_complex", - "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", - }, - "resourceType":"GMShader", - "resourceVersion":"2.0", - "type":1, -} \ No newline at end of file diff --git a/shaders/Shader14/Shader14.fsh b/shaders/Shader14/Shader14.fsh deleted file mode 100644 index e28a17897a..0000000000 --- a/shaders/Shader14/Shader14.fsh +++ /dev/null @@ -1,10 +0,0 @@ -// -// Simple passthrough fragment shader -// -varying vec2 v_vTexcoord; -varying vec4 v_vColour; - -void main() -{ - gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); -} diff --git a/shaders/Shader14/Shader14.vsh b/shaders/Shader14/Shader14.vsh deleted file mode 100644 index 3900c20f40..0000000000 --- a/shaders/Shader14/Shader14.vsh +++ /dev/null @@ -1,19 +0,0 @@ -// -// Simple passthrough vertex shader -// -attribute vec3 in_Position; // (x,y,z) -//attribute vec3 in_Normal; // (x,y,z) unused in this shader. -attribute vec4 in_Colour; // (r,g,b,a) -attribute vec2 in_TextureCoord; // (u,v) - -varying vec2 v_vTexcoord; -varying vec4 v_vColour; - -void main() -{ - vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); - gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; - - v_vColour = in_Colour; - v_vTexcoord = in_TextureCoord; -} diff --git a/shaders/Shader14/Shader14.yy b/shaders/Shader14/Shader14.yy deleted file mode 100644 index 454d01cfc4..0000000000 --- a/shaders/Shader14/Shader14.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$GMShader":"", - "%Name":"Shader14", - "name":"Shader14", - "parent":{ - "name":"tartaros_complex", - "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", - }, - "resourceType":"GMShader", - "resourceVersion":"2.0", - "type":1, -} \ No newline at end of file diff --git a/shaders/Shader15/Shader15.fsh b/shaders/Shader15/Shader15.fsh deleted file mode 100644 index e28a17897a..0000000000 --- a/shaders/Shader15/Shader15.fsh +++ /dev/null @@ -1,10 +0,0 @@ -// -// Simple passthrough fragment shader -// -varying vec2 v_vTexcoord; -varying vec4 v_vColour; - -void main() -{ - gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); -} diff --git a/shaders/Shader15/Shader15.vsh b/shaders/Shader15/Shader15.vsh deleted file mode 100644 index 3900c20f40..0000000000 --- a/shaders/Shader15/Shader15.vsh +++ /dev/null @@ -1,19 +0,0 @@ -// -// Simple passthrough vertex shader -// -attribute vec3 in_Position; // (x,y,z) -//attribute vec3 in_Normal; // (x,y,z) unused in this shader. -attribute vec4 in_Colour; // (r,g,b,a) -attribute vec2 in_TextureCoord; // (u,v) - -varying vec2 v_vTexcoord; -varying vec4 v_vColour; - -void main() -{ - vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); - gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; - - v_vColour = in_Colour; - v_vTexcoord = in_TextureCoord; -} diff --git a/shaders/Shader15/Shader15.yy b/shaders/Shader15/Shader15.yy deleted file mode 100644 index 89f77e8d30..0000000000 --- a/shaders/Shader15/Shader15.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$GMShader":"", - "%Name":"Shader15", - "name":"Shader15", - "parent":{ - "name":"tartaros_complex", - "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", - }, - "resourceType":"GMShader", - "resourceVersion":"2.0", - "type":1, -} \ No newline at end of file diff --git a/shaders/Shader16/Shader16.fsh b/shaders/Shader16/Shader16.fsh deleted file mode 100644 index e28a17897a..0000000000 --- a/shaders/Shader16/Shader16.fsh +++ /dev/null @@ -1,10 +0,0 @@ -// -// Simple passthrough fragment shader -// -varying vec2 v_vTexcoord; -varying vec4 v_vColour; - -void main() -{ - gl_FragColor = v_vColour * texture2D( gm_BaseTexture, v_vTexcoord ); -} diff --git a/shaders/Shader16/Shader16.vsh b/shaders/Shader16/Shader16.vsh deleted file mode 100644 index 3900c20f40..0000000000 --- a/shaders/Shader16/Shader16.vsh +++ /dev/null @@ -1,19 +0,0 @@ -// -// Simple passthrough vertex shader -// -attribute vec3 in_Position; // (x,y,z) -//attribute vec3 in_Normal; // (x,y,z) unused in this shader. -attribute vec4 in_Colour; // (r,g,b,a) -attribute vec2 in_TextureCoord; // (u,v) - -varying vec2 v_vTexcoord; -varying vec4 v_vColour; - -void main() -{ - vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); - gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; - - v_vColour = in_Colour; - v_vTexcoord = in_TextureCoord; -} diff --git a/shaders/Shader16/Shader16.yy b/shaders/Shader16/Shader16.yy deleted file mode 100644 index 6a3d6462f4..0000000000 --- a/shaders/Shader16/Shader16.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$GMShader":"", - "%Name":"Shader16", - "name":"Shader16", - "parent":{ - "name":"tartaros_complex", - "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", - }, - "resourceType":"GMShader", - "resourceVersion":"2.0", - "type":1, -} \ No newline at end of file