mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-27 15:02:03 -08:00
Code Issues Projects Releases Wiki Activity

3D progress

Browse source
This commit is contained in:
Anuken 2020-01-07 10:32:00 -05:00
parent c474b082cd
commit c8980163e9
3 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
core/src/mindustry/graphics/PlanetRenderer.java Normal file
View file

@ -0,0 +1,31 @@
package mindustry.graphics;
import arc.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.graphics.g3d.*;
import arc.util.*;
public class PlanetRenderer{
private ImmediateRenderer3D rend = new ImmediateRenderer3D(false, true, 0);
private Camera3D cam = new Camera3D();
public void draw(){
Draw.flush();
Tmp.v1.trns(Time.time() * 2f, 30f);
cam.position.set(Tmp.v1.x, Tmp.v1.y, 0);
cam.resize(Core.graphics.getWidth(), Core.graphics.getHeight());
cam.lookAt(0, 0, 0);
cam.update();
rend.begin(cam.combined(), Gl.triangleStrip);
rend.color(Color.red);
rend.vertex(0f, 0f, 0f);
rend.color(Color.green);
rend.vertex(0f, 5f, 0f);
rend.color(Color.blue);
rend.vertex(0f, 5f, 5f);
rend.end();
}
}

14
core/src/mindustry/ui/fragments/FadeInFragment.java
View file

@ -1,15 +1,14 @@
package mindustry.ui.fragments;
import arc.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.scene.*;
import arc.scene.event.*;
import mindustry.graphics.*;
/** Fades in a black overlay.*/
public class FadeInFragment extends Fragment{
private static final float duration = 40f;
float time = 0f;
PlanetRenderer rend = new PlanetRenderer();
@Override
public void build(Group parent){
@ -21,9 +20,10 @@ public class FadeInFragment extends Fragment{
@Override
public void draw(){
Draw.color(0f, 0f, 0f, Mathf.clamp(1f - time));
Fill.crect(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight());
Draw.color();
//Draw.color(0f, 0f, 0f, Mathf.clamp(1f - time));
//Fill.crect(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight());
//Draw.color();
rend.draw();
}
@Override
@ -31,7 +31,7 @@ public class FadeInFragment extends Fragment{
super.act(delta);
time += 1f / duration;
if(time > 1){
remove();
//remove();
}
}
});

2
gradle.properties
View file

@ -1,3 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=a85dbe44f7fb7aa66a28755931efee5e2e294a29
archash=04a41e39be5445d58c94209ec370e355f85f28b1