Windcorp/JavaProgressia
Windcorp/JavaProgressia
Archived
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Incremented version and made some small changes

Browse Source 
- Version is now pre-alpha 2. Yay?
- Removed compass display in the lower-left
- The cross can now be hidden by pressing F1
  - Does not hide LayerAbout though
- Generator spawns the player in the middle of a surface rather than at
its edge
This commit is contained in:
OLEGSHA 2021-08-20 21:37:49 +03:00
parent 2328f2ae3a
commit 6f90bf345b
Signed by: OLEGSHA
GPG Key ID: E57A4B08D64AFF7A
3 changed files with 10 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ru/windcorp/progressia/server/world/generation/planet/PlanetGenerator.java
View File

@ -69,7 +69,7 @@ public class PlanetGenerator extends AbstractWorldGenerator<Boolean> {
@Override
public Vec3 suggestSpawnLocation() {
return new Vec3(407f, 1f, getPlanet().getRadius() + 10);
return new Vec3(7f, 1f, getPlanet().getRadius() + 10);
}
@Override

2
src/main/java/ru/windcorp/progressia/test/LayerAbout.java
View File

@ -50,7 +50,7 @@ public class LayerAbout extends GUILayer {
new Label(
"Version",
font,
new MutableStringLocalized("LayerAbout.Version").format("pre-alpha 1")
new MutableStringLocalized("LayerAbout.Version").format("pre-alpha 2")
)
);

62
src/main/java/ru/windcorp/progressia/test/LayerTestUI.java
View File

@ -15,14 +15,13 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package ru.windcorp.progressia.test;
import org.lwjgl.glfw.GLFW;
import com.google.common.eventbus.Subscribe;
import glm.mat._4.Mat4;
import glm.vec._4.Vec4;
import ru.windcorp.progressia.client.graphics.Colors;
import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface;
@ -30,9 +29,6 @@ import ru.windcorp.progressia.client.graphics.flat.AssembledFlatLayer;
import ru.windcorp.progressia.client.graphics.flat.RenderTarget;
import ru.windcorp.progressia.client.graphics.input.KeyEvent;
import ru.windcorp.progressia.client.graphics.input.bus.Input;
import ru.windcorp.progressia.client.graphics.model.LambdaModel;
import ru.windcorp.progressia.client.graphics.texture.SimpleTextures;
import ru.windcorp.progressia.client.graphics.texture.Texture;
public class LayerTestUI extends AssembledFlatLayer {
@ -42,55 +38,13 @@ public class LayerTestUI extends AssembledFlatLayer {
GraphicsInterface.subscribeToInputEvents(this);
}
private boolean flag = false;
private static final int SCALE = 4;
private static final int TEX_SIZE = 16 * SCALE;
private static final int TEX_SHADOW = SCALE / 2;
private static final int BORDER = 5;
private static final int HEIGHT = TEX_SIZE + 4 * BORDER;
private static final int WIDTH = HEIGHT;
private boolean drawUI = true;
@Override
protected void assemble(RenderTarget target) {
final int boxColor = flag ? 0xFFEE8888 : 0xFFEEEE88;
final int borderColor = flag ? 0xFFAA4444 : 0xFFAAAA44;
final int boxShadowColor = flag ? 0xFF440000 : 0xFF444400;
int x = 2 * BORDER;
int y = 2 * BORDER;
target.fill(x + BORDER, y - BORDER, WIDTH, HEIGHT, boxShadowColor);
target.fill(x - 1, y - 1, WIDTH + 2, HEIGHT + 2, boxShadowColor);
target.fill(x, y, WIDTH, HEIGHT, borderColor);
target.fill(x + BORDER, y + BORDER, WIDTH - 2 * BORDER, HEIGHT - 2 * BORDER, boxColor);
target.pushTransform(new Mat4().identity().translate(x + 2 * BORDER, y + 2 * BORDER, 0));
final Texture compassBg = SimpleTextures.get("compass_icon");
final Texture compassFg = SimpleTextures.get("compass_icon_arrow");
target.drawTexture(TEX_SHADOW, -TEX_SHADOW, TEX_SIZE, TEX_SIZE, Colors.BLACK, compassBg);
target.drawTexture(0, 0, TEX_SIZE, TEX_SIZE, compassBg);
target.addCustomRenderer(
new LambdaModel(
LambdaModel.lambdaBuilder()
.addDynamicPart(
target.createRectagle(0, 0, TEX_SIZE, TEX_SIZE, Colors.WHITE, compassFg),
mat -> mat.translate(TEX_SIZE / 2, TEX_SIZE / 2, 0)
.rotateZ(getCompassRotation())
.translate(-TEX_SIZE / 2, -TEX_SIZE / 2, 0)
)
)
);
target.popTransform();
drawCross(target);
}
private double getCompassRotation() {
return 0;
if (drawUI) {
drawCross(target);
}
}
private void drawCross(RenderTarget target) {
@ -138,16 +92,16 @@ public class LayerTestUI extends AssembledFlatLayer {
@Override
protected void handleInput(Input input) {
// Do nothing
}
@Subscribe
public void onKeyEvent(KeyEvent event) {
if (event.isRepeat() || event.getKey() != GLFW.GLFW_KEY_LEFT_CONTROL) {
if (!event.isPress() || event.getKey() != GLFW.GLFW_KEY_F1) {
return;
}
flag = event.isPress();
drawUI = !drawUI;
invalidate();
}