mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-03-07 12:21:52 +09:00
PostProcessor working: nested FBO won't work, use FrameBufferManager
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -5,8 +5,8 @@ Thumbs.db
|
||||
*.jar
|
||||
.DS_Store
|
||||
~$*
|
||||
assets/modules/basegame/demoworld
|
||||
assets/modules/basegame/demoworld.gz
|
||||
assets/mods/basegame/demoworld
|
||||
assets/mods/basegame/demoworld.gz
|
||||
external_resource_packs.zip
|
||||
.idea/workspace.xml
|
||||
.tmp*
|
||||
|
||||
@@ -10,5 +10,5 @@ void main(void) {
|
||||
color.b = floor(63.0 * color.b + 0.5) / 63.0;
|
||||
// a: passthrough
|
||||
|
||||
gl_FragColor = vec4(color.rgb, 0.0);
|
||||
gl_FragColor = vec4(color.rgb, 1);
|
||||
}
|
||||
@@ -16,12 +16,12 @@ vec3 scanline_darkening = vec3(0.66, 0.66, 0.66);
|
||||
// 0: every odd line will get darkened; 1: every even line will get darkened
|
||||
uniform float alternative_scanline = 0.0; // 1.0: true
|
||||
|
||||
uniform float blur_blend = 0.8;
|
||||
uniform float blur_blend = 0.5;
|
||||
|
||||
void main(void) {
|
||||
vec4 color = texture2D(u_texture, v_texCoords).rgba;
|
||||
vec4 color_pre = texture2D(u_texture, (v_texCoords + (vec2(-2.0, 0.0) / resolution))).rgba;
|
||||
vec4 color_next = texture2D(u_texture, (v_texCoords + (vec2( 2.0, 0.0) / resolution))).rgba;
|
||||
vec4 color_pre = texture2D(u_texture, (v_texCoords + (vec2(-1.0, 0.0) / resolution))).rgba;
|
||||
vec4 color_next = texture2D(u_texture, (v_texCoords + (vec2( 1.0, 0.0) / resolution))).rgba;
|
||||
|
||||
color = color * (1.0 - blur_blend) + color_pre * (blur_blend / 2.0) + color_next * (blur_blend / 2.0);
|
||||
|
||||
@@ -41,5 +41,5 @@ void main(void) {
|
||||
}
|
||||
|
||||
gl_FragColor = vec4(out_color, 1);
|
||||
|
||||
//gl_FragColor = texture2D(u_texture, v_texCoords);
|
||||
}
|
||||
BIN
assets/graphics/blocks/block_markings_common.tga
LFS
Normal file
BIN
assets/graphics/blocks/block_markings_common.tga
LFS
Normal file
Binary file not shown.
|
Can't render this file because it contains an unexpected character in line 1 and column 20.
|
42
assets/mods/basegame/metadata.properties
Normal file
42
assets/mods/basegame/metadata.properties
Normal file
@@ -0,0 +1,42 @@
|
||||
# The name that will be displayed in game
|
||||
propername=Terrarum
|
||||
|
||||
# The description
|
||||
description=The base game
|
||||
|
||||
# Author of the module
|
||||
author=Terrarum
|
||||
|
||||
# Name of the entry script
|
||||
# Entry script must inherit net.torvald.terrarum.ModuleEntryPoint
|
||||
entrypoint=net.torvald.terrarum.modulebasegame.EntryPoint
|
||||
|
||||
# Release date in YYYY-MM-DD
|
||||
releasedate=2017-07-14
|
||||
|
||||
# The version, must be ^[0-9]+(\.[0-9]+)*$ in regex
|
||||
# e.g. 0.1 0.1.1347
|
||||
# e.g. 1 1.0.58385.02
|
||||
# e.g. 26558 0.0.0.0.0.1
|
||||
version=0.2.0
|
||||
|
||||
# External JARs the module might use, separate multiple by semicolon (;)
|
||||
libraries=
|
||||
|
||||
# Modules that must be pre-installed, separate multiple by semicolon (;)
|
||||
# Dependency syntax: "module name space allowed 444.44+"
|
||||
# Version number: + means equal or higher, ! means this exact number, - denotes interval, * is wildcard
|
||||
# the default is equal or lower
|
||||
# e.g. 1.4+ would allow 1.4, 0.6, 1.13, 1.42, 1.4.0, 1.4.4456
|
||||
# e.g. 10+.2 would allow 10.2, 10.1, 11.0 but would not allow any integer version (v10.0 != v10)
|
||||
# e.g. 10.4! would allow 10.4, 9.4, 8.4, 7.4
|
||||
# e.g. 10.3-11.4 would allow 10.3, 10.7, 10.12676, 11.0, 11.4 but not integer v11, 10.3.12 etc.
|
||||
# e.g. 13!.5 would allow 13.0, 13.1, 13.2, 13.3, 13.4 and 13.5
|
||||
# e.g. * would allow any version possible
|
||||
# e.g. *.* would allow any version on that scheme
|
||||
# e.g. *! would only allow all integer version
|
||||
# NOTE: it's your responsibility that your mod's version scheme would not be a total mess!
|
||||
# real world examples:
|
||||
# BaseGame 1.0+; CommandLineRenewed 2!.0+; Basegame 1!.0+; ScreenRecorder *; MyScrRecHack 1.*
|
||||
# Can you decode them? This is for hypothetical screen recorder mod.
|
||||
dependency=
|
||||
|
Can't render this file because it contains an unexpected character in line 11 and column 17.
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user