disabled gl30

This commit is contained in:
Anuken 2022-05-13 20:55:49 -04:00
parent 4b86d4cf6d
commit ad5e4f2556
5 changed files with 20 additions and 13 deletions

View File

@ -180,7 +180,6 @@ public class AndroidLauncher extends AndroidApplication{
}, new AndroidApplicationConfiguration(){{
useImmersiveMode = true;
hideStatusBar = true;
useGL30 = true;
}});
checkFiles(getIntent());

View File

@ -1496,6 +1496,17 @@ public class UnitType extends UnlockableContent{
Tmp.v1.set(x, y).rotate(rot);
float ex = Tmp.v1.x, ey = Tmp.v1.y;
//engine outlines (cursed?)
/*float z = Draw.z();
Draw.z(z - 0.0001f);
Draw.color(type.outlineColor);
Fill.circle(
unit.x + ex,
unit.y + ey,
(type.outlineRadius * Draw.scl + radius + Mathf.absin(Time.time, 2f, radius / 4f)) * scale
);
Draw.z(z);*/
Draw.color(color);
Fill.circle(
unit.x + ex,

View File

@ -36,11 +36,9 @@ public class DrawTurret extends DrawBlock{
for(var part : parts){
part.getOutlines(out);
}
if(preview.found()){
out.add(preview);
if(block.region.found()){
out.add(block.region);
}
if(block.region.found() && !Core.atlas.has(block.name + "-preview")){
out.add(block.region);
}
}
@ -124,7 +122,6 @@ public class DrawTurret extends DrawBlock{
/** @return the generated icons to be used for this block. */
@Override
public TextureRegion[] icons(Block block){
TextureRegion showTop = preview.found() ? preview : block.region;
return top.found() ? new TextureRegion[]{base, showTop, top} : new TextureRegion[]{base, showTop};
return top.found() ? new TextureRegion[]{base, preview, top} : new TextureRegion[]{base, preview};
}
}

View File

@ -41,8 +41,10 @@ public class DesktopLauncher extends ClientLauncher{
maximized = true;
width = 900;
height = 700;
//gl30 now default, disable with argument.
gl30 = !Structs.contains(arg, "-gl2");
//enable gl3 with command-line argument (slower performance, apparently)
if(Structs.contains(arg, "-gl3")){
gl30 = true;
}
if(Structs.contains(arg, "-antialias")){
samples = 16;
}

View File

@ -177,9 +177,7 @@ public class IOSLauncher extends IOSApplication.Delegate{
forced = false;
UINavigationController.attemptRotationToDeviceOrientation();
}
}, new IOSApplicationConfiguration(){{
useGL30 = true;
}});
}, new IOSApplicationConfiguration());
}
@Override