From b3de84c918e83608521bda2d3c06afa55e78ea95 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 29 Oct 2004 17:10:46 +0000 Subject: [PATCH] Render animations behind sprites in the back layer and in front of sprites in the front layer which is generally what we want. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3190 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/media/MediaPanel.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/java/com/threerings/media/MediaPanel.java b/src/java/com/threerings/media/MediaPanel.java index f1f24b03c..c077ab1e3 100644 --- a/src/java/com/threerings/media/MediaPanel.java +++ b/src/java/com/threerings/media/MediaPanel.java @@ -1,5 +1,5 @@ // -// $Id: MediaPanel.java,v 1.45 2004/09/18 23:50:20 mdb Exp $ +// $Id: MediaPanel.java,v 1.46 2004/10/29 17:10:46 mdb Exp $ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -42,6 +42,8 @@ import com.samskivert.util.IntListUtil; import com.samskivert.util.RuntimeAdjust; import com.samskivert.util.StringUtil; +import com.threerings.media.timer.MediaTimer; + import com.threerings.media.animation.Animation; import com.threerings.media.animation.AnimationManager; @@ -544,8 +546,13 @@ public class MediaPanel extends JComponent */ protected void paintBits (Graphics2D gfx, int layer, Rectangle dirty) { - _animmgr.paint(gfx, layer, dirty); - _spritemgr.paint(gfx, layer, dirty); + if (layer == FRONT) { + _spritemgr.paint(gfx, layer, dirty); + _animmgr.paint(gfx, layer, dirty); + } else { + _animmgr.paint(gfx, layer, dirty); + _spritemgr.paint(gfx, layer, dirty); + } } /** The frame manager with whom we register. */