Skip to content

Commit

Permalink
improved README and Recent Files Menu
Browse files Browse the repository at this point in the history
  • Loading branch information
i-make-robots committed Dec 23, 2023
1 parent 3d83d79 commit 422f294
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 19 deletions.
Binary file removed 2023-10-14.png
Binary file not shown.
16 changes: 1 addition & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![workflow](https://github.com/MarginallyClever/Robot-Overlord-App/actions/workflows/main.yml/badge.svg)

![Preview image](https://github.com/MarginallyClever/Robot-Overlord-App/blob/master/2023-10-14.png)
![Preview image](https://github.com/MarginallyClever/Robot-Overlord-App/blob/master/Screenshot 2023-12-23 120520.png)

# Robot Overlord #

Expand All @@ -18,10 +18,6 @@ Some of the robots it controls are:
- Spidee, a 6 legged crab-style walker.
- Dog Robot, a generic 4 legged walker.

# Video

[![Click to watch](README.PNG)](https://www.youtube.com/watch?v=QGYz506W1Pk)

# Why

[Our philosophy about Robot Overlord](https://github.com/MarginallyClever/Robot-Overlord-App/wiki/Why-Robot-Overlord%3F).
Expand All @@ -35,20 +31,10 @@ Steps to get started:

Then you should be able to run the application.

## Usage

Camera movement: middle mouse button. Click and drag to move forward and back. shift+drag to orbit. roll the middle mouse to change the orbit distance.

Double click any entity in the entityManager to select it, or use the entity panel in the top right.

For robot arms, select an arm and then open the control panel.

## More

If you're reading this, make an issue ticket and we will respond to it promptly.

![Preview image](https://github.com/MarginallyClever/Robot-Overlord-App/blob/master/Screenshot 2023-12-23 120520.png)

## Icons

Many app icons provided by http://icons8.com.
8 changes: 7 additions & 1 deletion src/main/java/com/marginallyclever/ro3/Registry.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.marginallyclever.ro3.texture.TextureFactory;

import javax.swing.event.EventListenerList;
import javax.vecmath.Vector3d;
import java.util.ArrayList;
import java.util.List;

Expand Down Expand Up @@ -41,7 +42,12 @@ public static void reset() {
// reset camera
List<Camera> toRemove = new ArrayList<>(cameras.getList());
for(Camera c : toRemove) cameras.remove(c);
cameras.add(new Camera("Camera 1"));
Camera first = new Camera("Camera 1");
cameras.add(first);
double v = Math.sqrt(Math.pow(50,2)/3d); // match the viewport default orbit distance.
first.setPosition(new Vector3d(v,v,v));
first.lookAt(new Vector3d(0,0,0));


// reset scene
List<Node> toRemove2 = new ArrayList<>(scene.getChildren());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private void updateRecentFilesMenu() {

public void removePath(String filePath) {
recentFiles.remove(filePath);
updateRecentFilesMenu();
saveToPreferences();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class Viewport extends OpenGLPanel implements GLEventListener {
private final JPopupMenu renderPassMenu = new JPopupMenu();
private final List<Boolean> buttonPressed = new ArrayList<>();
private int mx, my;
private double orbitRadius = 100;
private double orbitRadius = 50;
private final double orbitChangeFactor = 1.1; // must always be greater than 1


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class Camera extends Pose {
private double fovY = 60;
private double nearZ = 1;
private double farZ = 1000;
private double orbitRadius = 50;

public Camera() {
super("Camera");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.marginallyclever.ro3.render;
package com.marginallyclever.ro3.apps.render;

import com.marginallyclever.ro3.apps.render.Viewport;
import org.junit.jupiter.api.Assertions;
Expand Down

0 comments on commit 422f294

Please sign in to comment.