aboutsummaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorrtk0c <[email protected]>2022-06-03 23:30:01 -0700
committerrtk0c <[email protected]>2022-06-03 23:30:01 -0700
commit791b3f354b378769bffe623b05f1305c91b77101 (patch)
tree5409b311e6232eb4a6d3f8259b780d76b8ee1c59 /assets
parent60ccc62f4934e44ad5b905fdbcf458302b8d8a09 (diff)
Changeset: 64 [WIP] Rename directoriesmaster-switch-to-build2
Diffstat (limited to 'assets')
-rw-r--r--assets/.stationary/Shaders/Default.glsl38
-rw-r--r--assets/Ires/M_BasicWall.json12
-rw-r--r--assets/Ires/M_Default.json12
-rw-r--r--assets/Ires/M_Player.json12
-rw-r--r--assets/Ires/SS_Player.json1
-rw-r--r--assets/Ires/S_Default.json70
6 files changed, 0 insertions, 145 deletions
diff --git a/assets/.stationary/Shaders/Default.glsl b/assets/.stationary/Shaders/Default.glsl
deleted file mode 100644
index 1d93471..0000000
--- a/assets/.stationary/Shaders/Default.glsl
+++ /dev/null
@@ -1,38 +0,0 @@
-#type vertex
-#version 330 core
-
-layout(location = 0) in vec3 pos;
-layout(location = 1) in vec4 color;
-layout(location = 2) in vec2 texcoord;
-
-out Vertex2Fragmnet {
- vec4 color;
- vec2 texcoord;
-} v2f;
-
-// Autofill uniforms
-uniform mat4 transformation;
-
-void main() {
- gl_Position = transformation * vec4(pos, 1.0);
- v2f.color = color;
- v2f.texcoord = texcoord;
-}
-
-#type fragment
-#version 330 core
-
-in Vertex2Fragmnet {
- vec4 color;
- vec2 texcoord;
-} v2f;
-
-out vec4 fragColor;
-
-// Material uniforms
-uniform sampler2D textureAtlas;
-uniform vec4 taint;
-
-void main() {
- fragColor = texture(textureAtlas, v2f.texcoord) * v2f.color * taint;
-}
diff --git a/assets/Ires/M_BasicWall.json b/assets/Ires/M_BasicWall.json
deleted file mode 100644
index a0e2395..0000000
--- a/assets/Ires/M_BasicWall.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "Type": "IresMaterial",
- "Uid": [2568492772925683063, 3783268081215530432],
- "Value": {
- "Shader": [10239352483866045204, 2308094336962663863],
- "Fields": [{
- "Name": "taint",
- "Type": "Vector",
- "Value": [0.03868706524372101, 0.6346951127052307, 0.7892156839370728, 0.0]
- }]
- }
-} \ No newline at end of file
diff --git a/assets/Ires/M_Default.json b/assets/Ires/M_Default.json
deleted file mode 100644
index 0422e94..0000000
--- a/assets/Ires/M_Default.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "Type": "IresMaterial",
- "Uid": [1173927873865027620, 6990602806197486151],
- "Value": {
- "Shader": [10239352483866045204, 2308094336962663863],
- "Fields": [{
- "Name": "taint",
- "Type": "Vector",
- "Value": [1.0, 1.0, 1.0, 0.0]
- }]
- }
-} \ No newline at end of file
diff --git a/assets/Ires/M_Player.json b/assets/Ires/M_Player.json
deleted file mode 100644
index b2494dc..0000000
--- a/assets/Ires/M_Player.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "Type": "IresMaterial",
- "Uid": [8784140338803637141, 14601353797962284625],
- "Value": {
- "Shader": [10239352483866045204, 2308094336962663863],
- "Fields": [{
- "Name": "taint",
- "Type": "Vector",
- "Value": [1.0, 1.0, 1.0, 0.0]
- }]
- }
-} \ No newline at end of file
diff --git a/assets/Ires/SS_Player.json b/assets/Ires/SS_Player.json
deleted file mode 100644
index b413317..0000000
--- a/assets/Ires/SS_Player.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Type":"IresSpritesheet","Uid":[15827420425478528881,8130926596581515031],"Value":{"SpriteSheet":"S_Player.png","WSplit":6,"HSplit":4}} \ No newline at end of file
diff --git a/assets/Ires/S_Default.json b/assets/Ires/S_Default.json
deleted file mode 100644
index 0bfcb1b..0000000
--- a/assets/Ires/S_Default.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- "Type": "IresShader",
- "Uid": [10239352483866045204, 2308094336962663863],
- "Value": {
- "SourceFile": ".stationary/Shaders/Default.glsl",
- "Inputs": [
- {
- "Semantic": "VES_Position",
- "Name": "pos",
- "ScalarType": "float",
- "Width": 1,
- "Height": 3,
- "OpenGLLocation": 0
- },
- {
- "Semantic": "VES_TexCoords1",
- "Name": "texcoord",
- "ScalarType": "float",
- "Width": 1,
- "Height": 2,
- "OpenGLLocation": 1
- },
- {
- "Semantic": "VES_Color1",
- "Name": "color",
- "ScalarType": "float",
- "Width": 1,
- "Height": 4,
- "OpenGLLocation": 2
- }
- ],
- "Outputs": [
- {
- "Name": "fragColor",
- "ScalarType": "float",
- "Width": 1,
- "Height": 4,
- "OpenGLLocation": 0
- }
- ],
- "Uniforms": [
- {
- "Type": "Math",
- "AutoFill": true,
- "Value": {
- "Name": "transformation",
- "ScalarType": "float",
- "Width": 4,
- "Height": 4
- }
- },
- {
- "Type": "Math",
- "Value": {
- "Name": "taint",
- "Semantic": "VES_Color1",
- "ScalarType": "float",
- "Width": 1,
- "Height": 4
- }
- },
- {
- "Type": "Sampler",
- "Value": {
- "Name": "textureAtlas"
- }
- }
- ]
- }
-} \ No newline at end of file