Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply shaders on composite objects #94

Merged
merged 4 commits into from
May 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public class Overlap2dRenderer extends IteratingSystem {
private ComponentMapper<ParentNodeComponent> parentNodeMapper = ComponentMapper.getFor(ParentNodeComponent.class);
private ComponentMapper<TransformComponent> transformMapper = ComponentMapper.getFor(TransformComponent.class);
private ComponentMapper<MainItemComponent> mainItemComponentMapper = ComponentMapper.getFor(MainItemComponent.class);
private ComponentMapper<ShaderComponent> shaderComponentComponentMapper = ComponentMapper.getFor(ShaderComponent.class);

private DrawableLogicMapper drawableLogicMapper;
private RayHandler rayHandler;
Expand Down Expand Up @@ -79,7 +80,12 @@ private void drawRecursively(Entity rootEntity, float parentAlpha) {
//currentComposite = rootEntity;
CompositeTransformComponent curCompositeTransformComponent = compositeTransformMapper.get(rootEntity);
TransformComponent transform = transformMapper.get(rootEntity);
ShaderComponent shaderComponent = shaderComponentComponentMapper.get(rootEntity);

boolean shaderExist = shaderComponent!=null && shaderComponent.getShader()!=null;
if(shaderExist){
batch.setShader(shaderComponent.getShader());
}

if (curCompositeTransformComponent.transform || transform.rotation != 0 || transform.scaleX !=1 || transform.scaleY !=1){
MainItemComponent childMainItemComponent = mainItemComponentMapper.get(rootEntity);
Expand All @@ -95,6 +101,10 @@ private void drawRecursively(Entity rootEntity, float parentAlpha) {
drawChildren(rootEntity, batch, curCompositeTransformComponent, parentAlpha);
if (curCompositeTransformComponent.transform || transform.rotation != 0 || transform.scaleX !=1 || transform.scaleY !=1)
resetTransform(rootEntity, batch);

if(shaderExist){
batch.setShader(null);
}
}

private void drawChildren(Entity rootEntity, Batch batch, CompositeTransformComponent curCompositeTransformComponent, float parentAlpha) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ public TexturRegionDrawLogic() {
@Override
public void draw(Batch batch, Entity entity, float parentAlpha) {
TextureRegionComponent entityTextureRegionComponent = textureRegionMapper.get(entity);
if(shaderComponentMapper.has(entity)){

if(shaderComponentMapper.has(entity)){
ShaderComponent shaderComponent = shaderComponentMapper.get(entity);
if(shaderComponent.getShader() != null) {
batch.setShader(shaderComponent.getShader());
Expand All @@ -50,8 +51,8 @@ public void draw(Batch batch, Entity entity, float parentAlpha) {
//throw new RuntimeException( ": glError " + error);
}
}
}
}

if(entityTextureRegionComponent.polygonSprite != null) {
drawTiledPolygonSprite(batch, entity);
} else {
Expand Down