|
@@ -2,6 +2,7 @@ package xyz.tbvns.GeometryDash;
|
|
|
|
|
|
import com.badlogic.gdx.graphics.g3d.ModelInstance;
|
|
|
import com.badlogic.gdx.math.Vector3;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.joml.Matrix4d;
|
|
|
import org.joml.Vector3d;
|
|
|
import org.joml.Vector4d;
|
|
@@ -20,6 +21,7 @@ import java.util.List;
|
|
|
|
|
|
import static xyz.tbvns.GDConstant.*;
|
|
|
|
|
|
+@Slf4j
|
|
|
public class Render {
|
|
|
public double currentPercent;
|
|
|
public double currentDistance;
|
|
@@ -29,16 +31,19 @@ public class Render {
|
|
|
while (currentPercent <= 1) {
|
|
|
double speed = LevelInfo.getLevel().getSpeedAt((float) currentPercent);
|
|
|
double distancePerFrame = (speed / fps);
|
|
|
- currentPercent += distancePerFrame;
|
|
|
- double realDistancePerFrame = (speed / fps) / 30;
|
|
|
- double distancePerFramePercent = realDistancePerFrame / LevelInfo.getLevel().getMaxPos();
|
|
|
+// currentPercent += distancePerFrame;
|
|
|
+ double realDistancePerFrame = (speed / fps) * 30;
|
|
|
+ double distancePerFramePercent = realDistancePerFrame / LevelInfo.getLevel().getMaxPos() / 30;
|
|
|
currentPercent += distancePerFramePercent;
|
|
|
+ System.out.println(currentPercent);
|
|
|
+// log.info("Speed: {} \n distancePerFrame: {} \n currentPercent: {} \n realDistancePerFrame: {}");
|
|
|
|
|
|
Matrix4d camera = new Matrix4d();
|
|
|
camera.perspective(Math.toRadians(2), (double) 16/9, 0.001, 1000);
|
|
|
Vector3d cameraTranslation = new Vector3d(realDistancePerFrame * currentPercent, 5, 10);
|
|
|
camera.translation(cameraTranslation); //TODO: make that follow a new camera path editor
|
|
|
- builder.add(1, 1, X_PROPERTY_ID, projectPoint(camera, new Vector4f((float) cameraTranslation.x, (float) cameraTranslation.y, (float) cameraTranslation.z, 0)).x, projectPoint(camera, new Vector4f((float) cameraTranslation.x, (float) cameraTranslation.y, (float) cameraTranslation.z, 0)).y);
|
|
|
+ //builder.add(1, 1, X_PROPERTY_ID, projectPoint(camera, new Vector4f((float) cameraTranslation.x, (float) cameraTranslation.y, (float) cameraTranslation.z, 0)).x, Y_PROPERTY_ID,projectPoint(camera, new Vector4f((float) cameraTranslation.x, (float) cameraTranslation.y, (float) cameraTranslation.z, 0)).y);
|
|
|
+
|
|
|
|
|
|
for (ModelInstance model : ModelsManager.getLoadedModels()) {
|
|
|
GDInstance instance = (GDInstance) model.userData;
|