DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed panoramas/fogs/other AnimatedPlanes not animating properly

Browse Source
This commit is contained in:
Maruno17
2021-11-14 16:40:55 +00:00
parent a7f71e9620
commit 9657eca3d7
3 changed files with 35 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/003_Game processing/002_Scene_Map.rb
View File

@@ -140,6 +140,9 @@ class Scene_Map
def updateSpritesets def updateSpritesets
@spritesets = {} if !@spritesets @spritesets = {} if !@spritesets
for map in $map_factory.maps
@spritesets[map.map_id] = Spriteset_Map.new(map) if !@spritesets[map.map_id]
end
keys = @spritesets.keys.clone keys = @spritesets.keys.clone
for i in keys for i in keys
if !$map_factory.hasMap?(i) if !$map_factory.hasMap?(i)
@@ -151,9 +154,6 @@ class Scene_Map
end end
end end
@spritesetGlobal.update @spritesetGlobal.update
for map in $map_factory.maps
@spritesets[map.map_id] = Spriteset_Map.new(map) if !@spritesets[map.map_id]
end
pbDayNightTint(@map_renderer) pbDayNightTint(@map_renderer)
@map_renderer.update @map_renderer.update
Events.onMapUpdate.trigger(self) Events.onMapUpdate.trigger(self)

8
Data/Scripts/005_Sprites/007_Spriteset_Map.rb
View File

@@ -92,15 +92,15 @@ class Spriteset_Map
if @panorama_name!=@map.panorama_name || @panorama_hue!=@map.panorama_hue if @panorama_name!=@map.panorama_name || @panorama_hue!=@map.panorama_hue
@panorama_name = @map.panorama_name @panorama_name = @map.panorama_name
@panorama_hue = @map.panorama_hue @panorama_hue = @map.panorama_hue
@panorama.setPanorama(nil) if @panorama.bitmap!=nil @panorama.set_panorama(nil) if !@panorama.bitmap.nil?
@panorama.setPanorama(@panorama_name,@panorama_hue) if @panorama_name!="" @panorama.set_panorama(@panorama_name, @panorama_hue) if !nil_or_empty?(@panorama_name)
Graphics.frame_reset Graphics.frame_reset
end end
if @fog_name!=@map.fog_name || @fog_hue!=@map.fog_hue if @fog_name!=@map.fog_name || @fog_hue!=@map.fog_hue
@fog_name = @map.fog_name @fog_name = @map.fog_name
@fog_hue = @map.fog_hue @fog_hue = @map.fog_hue
@fog.setFog(nil) if @fog.bitmap!=nil @fog.set_fog(nil) if !@fog.bitmap.nil?
@fog.setFog(@fog_name,@fog_hue) if @fog_name!="" @fog.set_fog(@fog_name, @fog_hue) if !nil_or_empty?(@fog_name)
Graphics.frame_reset Graphics.frame_reset
end end
tmox = (@map.display_x/Game_Map::X_SUBPIXELS).round tmox = (@map.display_x/Game_Map::X_SUBPIXELS).round

208
Data/Scripts/007_Objects and windows/009_Planes.rb
View File

@@ -6,167 +6,14 @@ class Plane
def refresh; end def refresh; end
end end
#===============================================================================
# This class works around a limitation that planes are always
# 640 by 480 pixels in size regardless of the window's size.
#===============================================================================
class LargePlane < Plane
attr_accessor :borderX
attr_accessor :borderY
def initialize(viewport=nil)
@__sprite=Sprite.new(viewport)
@__disposed=false
@__ox=0
@__oy=0
@__bitmap=nil
@__visible=true
@__sprite.visible=false
@borderX=0
@borderY=0
end
def disposed?
return @__disposed
end
def dispose
if !@__disposed
@__sprite.bitmap.dispose if @__sprite.bitmap
@__sprite.dispose
@__sprite=nil
@__bitmap=nil
@__disposed=true
end
#super
end
def ox; @__ox; end
def oy; @__oy; end
def ox=(value)
return if @__ox==value
@__ox = value
refresh
end
def oy=(value)
return if @__oy==value
@__oy = value
refresh
end
def bitmap
return @__bitmap
end
def bitmap=(value)
if value==nil
if @__bitmap!=nil
@__bitmap=nil
@__sprite.visible=(@__visible && !@__bitmap.nil?)
end
elsif @__bitmap!=value && !value.disposed?
@__bitmap=value
refresh
elsif value.disposed?
if @__bitmap!=nil
@__bitmap=nil
@__sprite.visible=(@__visible && !@__bitmap.nil?)
end
end
end
def viewport; @__sprite.viewport; end
def zoom_x; @__sprite.zoom_x; end
def zoom_y; @__sprite.zoom_y; end
def opacity; @__sprite.opacity; end
def blend_type; @__sprite.blend_type; end
def visible; @__visible; end
def z; @__sprite.z; end
def color; @__sprite.color; end
def tone; @__sprite.tone; end
def zoom_x=(v)
return if @__sprite.zoom_x==v
@__sprite.zoom_x = v
refresh
end
def zoom_y=(v)
return if @__sprite.zoom_y==v
@__sprite.zoom_y = v
refresh
end
def opacity=(v); @__sprite.opacity=(v); end
def blend_type=(v); @__sprite.blend_type=(v); end
def visible=(v); @__visible=v; @__sprite.visible=(@__visible && !@__bitmap.nil?); end
def z=(v); @__sprite.z=(v); end
def color=(v); @__sprite.color=(v); end
def tone=(v); @__sprite.tone=(v); end
def update; end
def refresh
@__sprite.visible = (@__visible && !@__bitmap.nil?)
if @__bitmap
if !@__bitmap.disposed?
@__ox += @__bitmap.width*@__sprite.zoom_x if @__ox<0
@__oy += @__bitmap.height*@__sprite.zoom_y if @__oy<0
@__ox -= @__bitmap.width*@__sprite.zoom_x if @__ox>@__bitmap.width
@__oy -= @__bitmap.height*@__sprite.zoom_y if @__oy>@__bitmap.height
dwidth = (Graphics.width/@__sprite.zoom_x+@borderX).to_i # +2
dheight = (Graphics.height/@__sprite.zoom_y+@borderY).to_i # +2
@__sprite.bitmap = ensureBitmap(@__sprite.bitmap,dwidth,dheight)
@__sprite.bitmap.clear
tileBitmap(@__sprite.bitmap,@__bitmap,@__bitmap.rect)
else
@__sprite.visible = false
end
end
end
private
def ensureBitmap(bitmap,dwidth,dheight)
if !bitmap || bitmap.disposed? || bitmap.width<dwidth || bitmap.height<dheight
bitmap.dispose if bitmap
bitmap = Bitmap.new([1,dwidth].max,[1,dheight].max)
end
return bitmap
end
def tileBitmap(dstbitmap,srcbitmap,srcrect)
return if !srcbitmap || srcbitmap.disposed?
dstrect = dstbitmap.rect
left = (dstrect.x-@__ox/@__sprite.zoom_x).to_i
top = (dstrect.y-@__oy/@__sprite.zoom_y).to_i
while left>0; left -= srcbitmap.width; end
while top>0; top -= srcbitmap.height; end
y = top
while y<dstrect.height
x = left
while x<dstrect.width
dstbitmap.blt(x+@borderX,y+@borderY,srcbitmap,srcrect)
x += srcrect.width
end
y += srcrect.height
end
end
end
#=============================================================================== #===============================================================================
# A plane class that displays a single color. # A plane class that displays a single color.
#=============================================================================== #===============================================================================
class ColoredPlane < LargePlane class ColoredPlane < Plane
def initialize(color, viewport = nil) def initialize(color, viewport = nil)
super(viewport) super(viewport)
self.bitmap = Bitmap.new(32, 32) self.bitmap = Bitmap.new(32, 32)
setPlaneColor(color) set_plane_color(color)
end end
def dispose def dispose
@@ -174,57 +21,46 @@ class ColoredPlane < LargePlane
super super
end end
def setPlaneColor(value) def set_plane_color(value)
self.bitmap.fill_rect(0, 0, self.bitmap.width, self.bitmap.height, value) self.bitmap.fill_rect(0, 0, self.bitmap.width, self.bitmap.height, value)
self.refresh refresh
end end
end end
#=============================================================================== #===============================================================================
# A plane class that supports animated images. # A plane class that supports animated images.
#=============================================================================== #===============================================================================
class AnimatedPlane < LargePlane class AnimatedPlane < Plane
def initialize(viewport) def initialize(viewport)
super(viewport) super(viewport)
@bitmap = nil @bitmap = nil
end end
def dispose def dispose
clearBitmaps() clear_bitmap
super super
end end
def update def setBitmap(file, hue = 0)
super clear_bitmap
if @bitmap return if file.nil?
@bitmap.update @bitmap = AnimatedBitmap.new(file, hue)
self.bitmap=@bitmap.bitmap self.bitmap = @bitmap.bitmap if @bitmap
end
end end
def clearBitmaps def set_panorama(file, hue = 0)
setBitmap("Graphics/Panoramas/" + file, hue)
end
def set_fog(file, hue = 0)
setBitmap("Graphics/Fogs/" + file, hue)
end
private
def clear_bitmap
@bitmap.dispose if @bitmap @bitmap.dispose if @bitmap
@bitmap = nil @bitmap = nil
self.bitmap = nil if !self.disposed? self.bitmap = nil if !self.disposed?
end end
def setPanorama(file, hue=0)
clearBitmaps()
return if file==nil
@bitmap=AnimatedBitmap.new("Graphics/Panoramas/"+file,hue)
end
def setFog(file, hue=0)
clearBitmaps()
return if file==nil
@bitmap=AnimatedBitmap.new("Graphics/Fogs/"+file,hue)
end
def setBitmap(file, hue=0)
clearBitmaps()
return if file==nil
@bitmap=AnimatedBitmap.new(file,hue)
end
end end