disabled gl30
This commit is contained in:
@@ -180,7 +180,6 @@ public class AndroidLauncher extends AndroidApplication{
|
|||||||
}, new AndroidApplicationConfiguration(){{
|
}, new AndroidApplicationConfiguration(){{
|
||||||
useImmersiveMode = true;
|
useImmersiveMode = true;
|
||||||
hideStatusBar = true;
|
hideStatusBar = true;
|
||||||
useGL30 = true;
|
|
||||||
}});
|
}});
|
||||||
checkFiles(getIntent());
|
checkFiles(getIntent());
|
||||||
|
|
||||||
|
|||||||
@@ -1496,6 +1496,17 @@ public class UnitType extends UnlockableContent{
|
|||||||
Tmp.v1.set(x, y).rotate(rot);
|
Tmp.v1.set(x, y).rotate(rot);
|
||||||
float ex = Tmp.v1.x, ey = Tmp.v1.y;
|
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);
|
Draw.color(color);
|
||||||
Fill.circle(
|
Fill.circle(
|
||||||
unit.x + ex,
|
unit.x + ex,
|
||||||
|
|||||||
@@ -36,11 +36,9 @@ public class DrawTurret extends DrawBlock{
|
|||||||
for(var part : parts){
|
for(var part : parts){
|
||||||
part.getOutlines(out);
|
part.getOutlines(out);
|
||||||
}
|
}
|
||||||
if(preview.found()){
|
|
||||||
out.add(preview);
|
if(block.region.found() && !Core.atlas.has(block.name + "-preview")){
|
||||||
if(block.region.found()){
|
out.add(block.region);
|
||||||
out.add(block.region);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,7 +122,6 @@ public class DrawTurret extends DrawBlock{
|
|||||||
/** @return the generated icons to be used for this block. */
|
/** @return the generated icons to be used for this block. */
|
||||||
@Override
|
@Override
|
||||||
public TextureRegion[] icons(Block block){
|
public TextureRegion[] icons(Block block){
|
||||||
TextureRegion showTop = preview.found() ? preview : block.region;
|
return top.found() ? new TextureRegion[]{base, preview, top} : new TextureRegion[]{base, preview};
|
||||||
return top.found() ? new TextureRegion[]{base, showTop, top} : new TextureRegion[]{base, showTop};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,8 +41,10 @@ public class DesktopLauncher extends ClientLauncher{
|
|||||||
maximized = true;
|
maximized = true;
|
||||||
width = 900;
|
width = 900;
|
||||||
height = 700;
|
height = 700;
|
||||||
//gl30 now default, disable with argument.
|
//enable gl3 with command-line argument (slower performance, apparently)
|
||||||
gl30 = !Structs.contains(arg, "-gl2");
|
if(Structs.contains(arg, "-gl3")){
|
||||||
|
gl30 = true;
|
||||||
|
}
|
||||||
if(Structs.contains(arg, "-antialias")){
|
if(Structs.contains(arg, "-antialias")){
|
||||||
samples = 16;
|
samples = 16;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -177,9 +177,7 @@ public class IOSLauncher extends IOSApplication.Delegate{
|
|||||||
forced = false;
|
forced = false;
|
||||||
UINavigationController.attemptRotationToDeviceOrientation();
|
UINavigationController.attemptRotationToDeviceOrientation();
|
||||||
}
|
}
|
||||||
}, new IOSApplicationConfiguration(){{
|
}, new IOSApplicationConfiguration());
|
||||||
useGL30 = true;
|
|
||||||
}});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user