Skip to content

Commit

Permalink
Robot Overlord 3 (alpha 2.90) (#185)
Browse files Browse the repository at this point in the history
Robot Overlord 3 rewrites about 90% of the code base.

Robots are built by assembling a collection of Nodes. Each type of Node
does something different. Paired together they build up to creating
complex behavior.

Robot Overlord runs a ecosystem of apps. The apps work together to
manage, edit, and interact with Nodes,

Purely out of self interest the demo file will be the Sixi 3 robot arm.
  • Loading branch information
i-make-robots authored Dec 23, 2023
2 parents 81df189 + 2d897d4 commit af0e8de
Show file tree
Hide file tree
Showing 133 changed files with 7,476 additions and 219 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,4 @@ log.txt
## generated by app
*.log
scenes/
ro3.layout
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,8 @@ For robot arms, select an arm and then open the control panel.

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%202023-05-04%20154621.png)
![Preview image](https://github.com/MarginallyClever/Robot-Overlord-App/blob/master/Screenshot%202023-05-04%20154621.png)

## Icons

Many app icons provided by http://icons8.com.
57 changes: 53 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.marginallyclever</groupId>
<artifactId>RobotOverlord</artifactId>
<version>2.11.0</version>
<version>2.90.0</version>
<name>Robot Overlord</name>
<description>A friendly 3D user interface for controlling robots.</description>
<url>http://www.marginallyclever.com/</url>
Expand Down Expand Up @@ -82,6 +82,12 @@
<url>https://www.jogamp.org/deployment/maven/</url>
<layout>default</layout>
</repository>
<repository>
<id>snapshots-repo</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>

<build>
Expand Down Expand Up @@ -126,7 +132,7 @@
<SplashScreen-Image>splash.png</SplashScreen-Image>
</manifestEntries>
<manifest>
<mainClass>com.marginallyclever.robotoverlord.RobotOverlord</mainClass>
<mainClass>com.marginallyclever.ro3.RO3</mainClass>
<addClasspath>true</addClasspath>
</manifest>
</archive>
Expand Down Expand Up @@ -177,7 +183,7 @@
<SplashScreen-Image>splash.png</SplashScreen-Image>
</manifestEntries>
<manifest>
<mainClass>com.marginallyclever.robotoverlord.RobotOverlord</mainClass>
<mainClass>com.marginallyclever.ro3.RO3</mainClass>
<addClasspath>true</addClasspath>
</manifest>
</archive>
Expand Down Expand Up @@ -294,6 +300,14 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>16</source>
<target>16</target>
</configuration>
</plugin>
</plugins>

<pluginManagement>
Expand Down Expand Up @@ -486,12 +500,47 @@
<artifactId>webcam-capture</artifactId>
<version>0.3.12</version>
</dependency>

<dependency>
<groupId>io.github.andrewauclair</groupId>
<artifactId>modern-docking-api</artifactId>
<version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.github.andrewauclair</groupId>
<artifactId>modern-docking-single-app</artifactId>
<version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.github.andrewauclair</groupId>
<artifactId>modern-docking-ui</artifactId>
<version>0.11.0-SNAPSHOT</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.formdev/flatlaf -->
<dependency>
<groupId>com.formdev</groupId>
<artifactId>flatlaf</artifactId>
<version>3.2.5</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.github.weisj/jsvg -->
<dependency>
<groupId>com.github.weisj</groupId>
<artifactId>jsvg</artifactId>
<version>1.3.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.reflections/reflections -->
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.10.2</version>
</dependency>

</dependencies>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<minimum.maven.version>3.8.1</minimum.maven.version>
<minimum.java.version>15</minimum.java.version>
<minimum.java.version>16</minimum.java.version>
<maven-dependency-plugin.ignoreNonCompile>true</maven-dependency-plugin.ignoreNonCompile>
<maven.compiler.source>${minimum.java.version}</maven.compiler.source>
<maven.compiler.target>${minimum.java.version}</maven.compiler.target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ public void closeConnection() {
try {
inputStream.close();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
channel.disconnect();
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/com/marginallyclever/convenience/AABB.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
package com.marginallyclever.convenience;

import com.jogamp.opengl.GL3;
import com.marginallyclever.convenience.helpers.MatrixHelper;
import com.marginallyclever.robotoverlord.systems.render.mesh.Mesh;

import javax.vecmath.Matrix4d;
import javax.vecmath.Point3d;
import java.io.Serializable;
import java.nio.IntBuffer;

/**
* Axially-aligned bounding box. Used for fast sorting and filtering.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,10 @@ static Point3d rayConvexPolygon(Ray ray, Point3d [] points) {
}

/**
* TODO mesh / mesh intersection
* @return true if the two mesh intersect.
*/
public static boolean meshMesh(final Matrix4d ma, final Mesh sa, final Matrix4d mb, final Mesh sb) {

return false;
throw new RuntimeException("Not implemented yet.");
}


Expand Down
Loading

0 comments on commit af0e8de

Please sign in to comment.