Skip to content

Commit

Permalink
Fix class after last MinkoV2 update
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexandre Cyprien committed Dec 7, 2011
1 parent cd78936 commit 7e56ea0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions src/aerys/minko/render/effect/picking/PickingEffect.as
@@ -1,6 +1,5 @@
package aerys.minko.render.effect.picking
{
import aerys.minko.render.RenderTarget;
import aerys.minko.render.effect.IEffect;
import aerys.minko.render.effect.IEffectPass;
import aerys.minko.render.effect.SinglePassEffect;
Expand All @@ -12,6 +11,8 @@ package aerys.minko.render.effect.picking
import aerys.minko.render.shader.node.leaf.Constant;
import aerys.minko.render.shader.node.leaf.StyleParameter;
import aerys.minko.render.shader.node.operation.manipulation.Combine;
import aerys.minko.render.target.AbstractRenderTarget;
import aerys.minko.render.target.BackBufferRenderTarget;
import aerys.minko.scene.data.StyleData;
import aerys.minko.scene.data.TransformData;
import aerys.minko.scene.data.ViewportData;
Expand All @@ -26,10 +27,10 @@ package aerys.minko.render.effect.picking
protected static const SHADER : PickingShader = new PickingShader();
protected static const RECTANGLE : Rectangle = new Rectangle(0, 0, 10, 10);

private var _renderTarget : RenderTarget;
private var _renderTarget : AbstractRenderTarget;

public function PickingEffect(priority : Number = 0,
renderTarget : RenderTarget = null)
renderTarget : AbstractRenderTarget = null)
{
super(SHADER, priority, renderTarget);
}
Expand All @@ -50,7 +51,7 @@ package aerys.minko.render.effect.picking
var height : uint = ViewportData(worldData[ViewportData]).height;

if (!_renderTarget || _renderTarget.width != width || _renderTarget.height != height)
_renderTarget = new RenderTarget(RenderTarget.BACKBUFFER, width, height);
_renderTarget = new BackBufferRenderTarget(width, height);

state.blending = Blending.NORMAL;
// state.rectangle = RECTANGLE;
Expand Down
2 changes: 1 addition & 1 deletion src/aerys/minko/render/effect/picking/PickingShader.as
Expand Up @@ -10,7 +10,7 @@ package aerys.minko.render.effect.picking
return vertexClipspacePosition;
}

override protected function getOutputColor() : SValue
override protected function getOutputColor(kills : Vector.<SValue>) : SValue
{
return float4(getStyleParameter(3, PickingStyle.CURRENT_COLOR), 1.);
}
Expand Down

0 comments on commit 7e56ea0

Please sign in to comment.