mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-09 14:14:59 +00:00
Caches expanded autotiles to reduce stutter caused by map connections
This commit is contained in:
@@ -2,28 +2,28 @@
|
|||||||
#
|
#
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
class TilemapRenderer
|
class TilemapRenderer
|
||||||
attr_reader :tilesets
|
attr_reader :tilesets
|
||||||
attr_reader :autotiles
|
attr_reader :autotiles
|
||||||
attr_accessor :tone
|
attr_accessor :tone
|
||||||
attr_accessor :color
|
attr_accessor :color
|
||||||
attr_reader :viewport
|
attr_reader :viewport
|
||||||
attr_accessor :ox # Does nothing
|
attr_accessor :ox # Does nothing
|
||||||
attr_accessor :oy # Does nothing
|
attr_accessor :oy # Does nothing
|
||||||
attr_accessor :visible # Does nothing
|
attr_accessor :visible # Does nothing
|
||||||
|
|
||||||
DISPLAY_TILE_WIDTH = Game_Map::TILE_WIDTH rescue 32
|
DISPLAY_TILE_WIDTH = Game_Map::TILE_WIDTH rescue 32
|
||||||
DISPLAY_TILE_HEIGHT = Game_Map::TILE_HEIGHT rescue 32
|
DISPLAY_TILE_HEIGHT = Game_Map::TILE_HEIGHT rescue 32
|
||||||
SOURCE_TILE_WIDTH = 32
|
SOURCE_TILE_WIDTH = 32
|
||||||
SOURCE_TILE_HEIGHT = 32
|
SOURCE_TILE_HEIGHT = 32
|
||||||
ZOOM_X = DISPLAY_TILE_WIDTH / SOURCE_TILE_WIDTH
|
ZOOM_X = DISPLAY_TILE_WIDTH / SOURCE_TILE_WIDTH
|
||||||
ZOOM_Y = DISPLAY_TILE_HEIGHT / SOURCE_TILE_HEIGHT
|
ZOOM_Y = DISPLAY_TILE_HEIGHT / SOURCE_TILE_HEIGHT
|
||||||
TILESET_TILES_PER_ROW = 8
|
TILESET_TILES_PER_ROW = 8
|
||||||
AUTOTILES_COUNT = 8 # Counting the blank tile as an autotile
|
AUTOTILES_COUNT = 8 # Counting the blank tile as an autotile
|
||||||
TILES_PER_AUTOTILE = 48
|
TILES_PER_AUTOTILE = 48
|
||||||
TILESET_START_ID = AUTOTILES_COUNT * TILES_PER_AUTOTILE
|
TILESET_START_ID = AUTOTILES_COUNT * TILES_PER_AUTOTILE
|
||||||
# If an autotile's filename ends with "[x]", its frame duration will be x/20
|
# If an autotile's filename ends with "[x]", its frame duration will be x/20
|
||||||
# seconds instead.
|
# seconds instead.
|
||||||
AUTOTILE_FRAME_DURATION = 5 # In 1/20ths of a second
|
AUTOTILE_FRAME_DURATION = 5 # In 1/20ths of a second
|
||||||
|
|
||||||
# Filenames of extra autotiles for each tileset. Each tileset's entry is an
|
# Filenames of extra autotiles for each tileset. Each tileset's entry is an
|
||||||
# array containing two other arrays (you can leave either of those empty, but
|
# array containing two other arrays (you can leave either of those empty, but
|
||||||
@@ -38,10 +38,10 @@ class TilemapRenderer
|
|||||||
# Extra autotiles are only useful if the tiles are animated, because otherwise
|
# Extra autotiles are only useful if the tiles are animated, because otherwise
|
||||||
# you just have some tiles which belong in the tileset instead.
|
# you just have some tiles which belong in the tileset instead.
|
||||||
EXTRA_AUTOTILES = {
|
EXTRA_AUTOTILES = {
|
||||||
# Examples:
|
# Examples:
|
||||||
# 1 => [["Sand shore"], ["Flowers2"]],
|
# 1 => [["Sand shore"], ["Flowers2"]],
|
||||||
# 2 => [[], ["Flowers2", "Waterfall", "Waterfall crest", "Waterfall bottom"]],
|
# 2 => [[], ["Flowers2", "Waterfall", "Waterfall crest", "Waterfall bottom"]],
|
||||||
# 6 => [["Water rock", "Sea deep"], []]
|
# 6 => [["Water rock", "Sea deep"], []]
|
||||||
}
|
}
|
||||||
|
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
@@ -52,11 +52,11 @@ class TilemapRenderer
|
|||||||
attr_accessor :bitmaps
|
attr_accessor :bitmaps
|
||||||
|
|
||||||
def initialize
|
def initialize
|
||||||
@bitmaps = {}
|
@bitmaps = {}
|
||||||
@bitmap_wraps = {} # Whether each tileset is a mega texture and has multiple columns
|
@bitmap_wraps = {} # Whether each tileset is a mega texture and has multiple columns
|
||||||
@load_counts = {}
|
@load_counts = {}
|
||||||
@bridge = 0
|
@bridge = 0
|
||||||
@changed = true
|
@changed = true
|
||||||
end
|
end
|
||||||
|
|
||||||
def [](filename)
|
def [](filename)
|
||||||
@@ -124,10 +124,10 @@ class TilemapRenderer
|
|||||||
|
|
||||||
def initialize
|
def initialize
|
||||||
super
|
super
|
||||||
@frame_counts = {} # Number of frames in each autotile
|
@frame_counts = {} # Number of frames in each autotile
|
||||||
@frame_durations = {} # How long each frame lasts per autotile
|
@frame_durations = {} # How long each frame lasts per autotile
|
||||||
@current_frames = {} # Which frame each autotile is currently showing
|
@current_frames = {} # Which frame each autotile is currently showing
|
||||||
@timer_start = System.uptime
|
@timer_start = System.uptime
|
||||||
end
|
end
|
||||||
|
|
||||||
def []=(filename, value)
|
def []=(filename, value)
|
||||||
@@ -137,25 +137,49 @@ class TilemapRenderer
|
|||||||
set_current_frame(filename)
|
set_current_frame(filename)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
EXPANDED_AUTOTILES_FOLDER = "Graphics/Autotiles/ExpandedAutotiles/"
|
||||||
|
|
||||||
def add(filename)
|
def add(filename)
|
||||||
return if nil_or_empty?(filename)
|
return if nil_or_empty?(filename)
|
||||||
if @bitmaps[filename]
|
if @bitmaps[filename]
|
||||||
@load_counts[filename] += 1
|
@load_counts[filename] += 1
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
orig_bitmap = pbGetAutotile(filename)
|
|
||||||
@bitmap_wraps[filename] = false
|
# Try to load expanded autotile from cache first
|
||||||
duration = AUTOTILE_FRAME_DURATION
|
cached_path = File.join("Graphics", "Autotiles/ExpandedAutotiles", "#{filename}.png")
|
||||||
if filename[/\[\s*(\d+?)\s*\]\s*$/]
|
if FileTest.exist?(cached_path)
|
||||||
duration = $~[1].to_i
|
echoln "Loading cached expanded autotile for #{filename}"
|
||||||
|
bitmap = RPG::Cache.load_bitmap(EXPANDED_AUTOTILES_FOLDER, filename)
|
||||||
|
|
||||||
|
duration = AUTOTILE_FRAME_DURATION
|
||||||
|
if filename[/\[\s*(\d+?)\s*\]\s*$/]
|
||||||
|
duration = $~[1].to_i
|
||||||
|
end
|
||||||
|
@frame_durations[filename] = duration.to_f / 20
|
||||||
|
|
||||||
|
else
|
||||||
|
orig_bitmap = pbGetAutotile(filename)
|
||||||
|
@bitmap_wraps[filename] = false
|
||||||
|
duration = AUTOTILE_FRAME_DURATION
|
||||||
|
if filename[/\[\s*(\d+?)\s*\]\s*$/]
|
||||||
|
duration = $~[1].to_i
|
||||||
|
end
|
||||||
|
@frame_durations[filename] = duration.to_f / 20
|
||||||
|
expanded_bitmap = AutotileExpander.expand(orig_bitmap)
|
||||||
|
|
||||||
|
# Save expanded bitmap to cache for next time
|
||||||
|
Dir.mkdir(EXPANDED_AUTOTILES_FOLDER) unless Dir.exist?(EXPANDED_AUTOTILES_FOLDER)
|
||||||
|
expanded_bitmap.save_to_png(cached_path)
|
||||||
|
|
||||||
|
bitmap = expanded_bitmap
|
||||||
|
orig_bitmap.dispose if orig_bitmap != expanded_bitmap
|
||||||
end
|
end
|
||||||
@frame_durations[filename] = duration.to_f / 20
|
|
||||||
bitmap = AutotileExpander.expand(orig_bitmap)
|
|
||||||
self[filename] = bitmap
|
self[filename] = bitmap
|
||||||
if bitmap.height > SOURCE_TILE_HEIGHT && bitmap.height < TILES_PER_AUTOTILE * SOURCE_TILE_HEIGHT
|
if bitmap.height > SOURCE_TILE_HEIGHT && bitmap.height < TILES_PER_AUTOTILE * SOURCE_TILE_HEIGHT
|
||||||
@bitmap_wraps[filename] = true
|
@bitmap_wraps[filename] = true
|
||||||
end
|
end
|
||||||
orig_bitmap.dispose if orig_bitmap != bitmap
|
|
||||||
@load_counts[filename] = 1
|
@load_counts[filename] = 1
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -243,57 +267,57 @@ class TilemapRenderer
|
|||||||
attr_accessor :need_refresh
|
attr_accessor :need_refresh
|
||||||
|
|
||||||
def set_bitmap(filename, tile_id, autotile, animated, priority, bitmap)
|
def set_bitmap(filename, tile_id, autotile, animated, priority, bitmap)
|
||||||
self.bitmap = bitmap
|
self.bitmap = bitmap
|
||||||
self.src_rect = Rect.new(0, 0, SOURCE_TILE_WIDTH, SOURCE_TILE_HEIGHT)
|
self.src_rect = Rect.new(0, 0, SOURCE_TILE_WIDTH, SOURCE_TILE_HEIGHT)
|
||||||
self.zoom_x = ZOOM_X
|
self.zoom_x = ZOOM_X
|
||||||
self.zoom_y = ZOOM_Y
|
self.zoom_y = ZOOM_Y
|
||||||
@filename = filename
|
@filename = filename
|
||||||
@tile_id = tile_id
|
@tile_id = tile_id
|
||||||
@is_autotile = autotile
|
@is_autotile = autotile
|
||||||
@animated = animated
|
@animated = animated
|
||||||
@priority = priority
|
@priority = priority
|
||||||
@shows_reflection = false
|
@shows_reflection = false
|
||||||
@bridge = false
|
@bridge = false
|
||||||
self.visible = !bitmap.nil?
|
self.visible = !bitmap.nil?
|
||||||
@need_refresh = true
|
@need_refresh = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
|
|
||||||
def initialize(viewport)
|
def initialize(viewport)
|
||||||
@tilesets = TilesetBitmaps.new
|
@tilesets = TilesetBitmaps.new
|
||||||
@autotiles = AutotileBitmaps.new
|
@autotiles = AutotileBitmaps.new
|
||||||
@tiles_horizontal_count = (Graphics.width.to_f / DISPLAY_TILE_WIDTH).ceil + 1
|
@tiles_horizontal_count = (Graphics.width.to_f / DISPLAY_TILE_WIDTH).ceil + 1
|
||||||
@tiles_vertical_count = (Graphics.height.to_f / DISPLAY_TILE_HEIGHT).ceil + 1
|
@tiles_vertical_count = (Graphics.height.to_f / DISPLAY_TILE_HEIGHT).ceil + 1
|
||||||
@tone = Tone.new(0, 0, 0, 0)
|
@tone = Tone.new(0, 0, 0, 0)
|
||||||
@old_tone = Tone.new(0, 0, 0, 0)
|
@old_tone = Tone.new(0, 0, 0, 0)
|
||||||
@color = Color.new(0, 0, 0, 0)
|
@color = Color.new(0, 0, 0, 0)
|
||||||
@old_color = Color.new(0, 0, 0, 0)
|
@old_color = Color.new(0, 0, 0, 0)
|
||||||
@self_viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
|
@self_viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
|
||||||
@viewport = (viewport) ? viewport : @self_viewport
|
@viewport = (viewport) ? viewport : @self_viewport
|
||||||
@old_viewport_ox = 0
|
@old_viewport_ox = 0
|
||||||
@old_viewport_oy = 0
|
@old_viewport_oy = 0
|
||||||
# NOTE: The extra tiles horizontally/vertically hang off the left and top
|
# NOTE: The extra tiles horizontally/vertically hang off the left and top
|
||||||
# edges of the screen, because the pixel_offset values are positive
|
# edges of the screen, because the pixel_offset values are positive
|
||||||
# and are added to the tile sprite coordinates.
|
# and are added to the tile sprite coordinates.
|
||||||
@tiles = []
|
@tiles = []
|
||||||
@tiles_horizontal_count.times do |i|
|
@tiles_horizontal_count.times do |i|
|
||||||
@tiles[i] = []
|
@tiles[i] = []
|
||||||
@tiles_vertical_count.times do |j|
|
@tiles_vertical_count.times do |j|
|
||||||
@tiles[i][j] = Array.new(3) { TileSprite.new(@viewport) }
|
@tiles[i][j] = Array.new(3) { TileSprite.new(@viewport) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@current_map_id = 0
|
@current_map_id = 0
|
||||||
@tile_offset_x = 0
|
@tile_offset_x = 0
|
||||||
@tile_offset_y = 0
|
@tile_offset_y = 0
|
||||||
@pixel_offset_x = 0
|
@pixel_offset_x = 0
|
||||||
@pixel_offset_y = 0
|
@pixel_offset_y = 0
|
||||||
@ox = 0
|
@ox = 0
|
||||||
@oy = 0
|
@oy = 0
|
||||||
@visible = true
|
@visible = true
|
||||||
@need_refresh = true
|
@need_refresh = true
|
||||||
@disposed = false
|
@disposed = false
|
||||||
end
|
end
|
||||||
|
|
||||||
def dispose
|
def dispose
|
||||||
@@ -361,7 +385,7 @@ class TilemapRenderer
|
|||||||
if tile_id < TILES_PER_AUTOTILE
|
if tile_id < TILES_PER_AUTOTILE
|
||||||
tile.set_bitmap("", tile_id, false, false, 0, nil)
|
tile.set_bitmap("", tile_id, false, false, 0, nil)
|
||||||
tile.shows_reflection = false
|
tile.shows_reflection = false
|
||||||
tile.bridge = false
|
tile.bridge = false
|
||||||
else
|
else
|
||||||
terrain_tag = map.terrain_tags[tile_id] || 0
|
terrain_tag = map.terrain_tags[tile_id] || 0
|
||||||
terrain_tag_data = GameData::TerrainTag.try_get(terrain_tag)
|
terrain_tag_data = GameData::TerrainTag.try_get(terrain_tag)
|
||||||
@@ -378,11 +402,12 @@ class TilemapRenderer
|
|||||||
end
|
end
|
||||||
if tile_id < true_tileset_start_id
|
if tile_id < true_tileset_start_id
|
||||||
filename = ""
|
filename = ""
|
||||||
if tile_id < TILESET_START_ID # Real autotiles
|
if tile_id < TILESET_START_ID # Real autotiles
|
||||||
filename = map.autotile_names[(tile_id / TILES_PER_AUTOTILE) - 1]
|
filename = map.autotile_names[(tile_id / TILES_PER_AUTOTILE) - 1]
|
||||||
elsif tile_id < single_autotile_start_id # Large extra autotiles
|
elsif tile_id < single_autotile_start_id # Large extra autotiles
|
||||||
filename = extra_autotile_arrays[0][(tile_id - TILESET_START_ID) / TILES_PER_AUTOTILE]
|
filename = extra_autotile_arrays[0][(tile_id - TILESET_START_ID) / TILES_PER_AUTOTILE]
|
||||||
else # Single extra autotiles
|
else
|
||||||
|
# Single extra autotiles
|
||||||
filename = extra_autotile_arrays[1][tile_id - single_autotile_start_id]
|
filename = extra_autotile_arrays[1][tile_id - single_autotile_start_id]
|
||||||
end
|
end
|
||||||
tile.set_bitmap(filename, tile_id, true, @autotiles.animated?(filename),
|
tile.set_bitmap(filename, tile_id, true, @autotiles.animated?(filename),
|
||||||
@@ -392,7 +417,7 @@ class TilemapRenderer
|
|||||||
tile.set_bitmap(filename, tile_id, false, false, priority, @tilesets[filename])
|
tile.set_bitmap(filename, tile_id, false, false, priority, @tilesets[filename])
|
||||||
end
|
end
|
||||||
tile.shows_reflection = terrain_tag_data&.shows_reflections
|
tile.shows_reflection = terrain_tag_data&.shows_reflections
|
||||||
tile.bridge = terrain_tag_data&.bridge
|
tile.bridge = terrain_tag_data&.bridge
|
||||||
end
|
end
|
||||||
refresh_tile_src_rect(tile, tile_id)
|
refresh_tile_src_rect(tile, tile_id)
|
||||||
end
|
end
|
||||||
@@ -447,7 +472,7 @@ class TilemapRenderer
|
|||||||
@tile_offset_x -= offsets[0]
|
@tile_offset_x -= offsets[0]
|
||||||
@tile_offset_y -= offsets[1]
|
@tile_offset_y -= offsets[1]
|
||||||
else
|
else
|
||||||
ret = true # Need a full refresh
|
ret = true # Need a full refresh
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
ret = true
|
ret = true
|
||||||
@@ -556,7 +581,7 @@ class TilemapRenderer
|
|||||||
@screen_moved_vertically = false
|
@screen_moved_vertically = false
|
||||||
if $PokemonGlobal.bridge != @bridge
|
if $PokemonGlobal.bridge != @bridge
|
||||||
@bridge = $PokemonGlobal.bridge
|
@bridge = $PokemonGlobal.bridge
|
||||||
@screen_moved_vertically = true # To update bridge tiles' z values
|
@screen_moved_vertically = true # To update bridge tiles' z values
|
||||||
end
|
end
|
||||||
do_full_refresh = true if check_if_screen_moved
|
do_full_refresh = true if check_if_screen_moved
|
||||||
# Update all tile sprites
|
# Update all tile sprites
|
||||||
@@ -609,7 +634,7 @@ class TilemapRenderer
|
|||||||
coord.each do |tile|
|
coord.each do |tile|
|
||||||
tile.set_bitmap("", 0, false, false, 0, nil)
|
tile.set_bitmap("", 0, false, false, 0, nil)
|
||||||
tile.shows_reflection = false
|
tile.shows_reflection = false
|
||||||
tile.bridge = false
|
tile.bridge = false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user