Skip to content

Update to Robot Lab #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
madhephaestus merged 14 commits into from
Jan 7, 2026
Merged

Update to Robot Lab #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a269634
add file listener for the limb configurations
madhephaestus Dec 30, 2025
e6b3c82
format
madhephaestus Dec 30, 2025
09ad286
kernel
madhephaestus Jan 1, 2026
2da050f
less wait on regenerate
madhephaestus Jan 1, 2026
0d13611
spelline
madhephaestus Jan 1, 2026
731ea27
allow for 2 watchers in a single operation
madhephaestus Jan 1, 2026
a39510a
Merge branch 'main' of
madhephaestus Jan 6, 2026
f20152b
workplane should always return a valid transform no matter what
madhephaestus Jan 6, 2026
5794fc4
make sure the manipulator is not set randomly
madhephaestus Jan 6, 2026
88da711
studio
madhephaestus Jan 6, 2026
5a3255c
studio
madhephaestus Jan 6, 2026
c330bf6
check the manipulator before using it
madhephaestus Jan 6, 2026
90f768c
udate thumbnail oeration
madhephaestus Jan 7, 2026
6b3f237
kernel to development
madhephaestus Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BowlerStudio
Open in desktop
Submodule BowlerStudio updated 3 files
+1 −1 libraries/bowler-script-kernel
+1 −1 src/main/java/com/neuronrobotics/bowlerstudio/creature/CreatureLab.java
+18 −3 src/main/java/com/neuronrobotics/bowlerstudio/threed/BowlerStudio3dEngine.java
4 changes: 3 additions & 1 deletion src/main/java/com/commonwealthrobotics/ActiveProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import com.neuronrobotics.bowlerstudio.SplashManager;
import com.neuronrobotics.bowlerstudio.assets.ConfigurationDatabase;
import com.neuronrobotics.bowlerstudio.assets.FontSizeManager;
import com.neuronrobotics.bowlerstudio.creature.ThumbnailImage;
import com.neuronrobotics.bowlerstudio.scripting.DownloadManager;
import com.neuronrobotics.bowlerstudio.scripting.ScriptingEngine;
import com.neuronrobotics.bowlerstudio.scripting.cadoodle.CaDoodleOperation;
Expand Down Expand Up @@ -97,7 +98,7 @@ public Thread regenerateFrom(CaDoodleOperation source) {
return null;
new Thread(() -> {
try {
Thread.sleep(200);
Thread.sleep(100);
} catch (InterruptedException e) {
// Auto-generated catch block
com.neuronrobotics.sdk.common.Log.error(e);
Expand Down Expand Up @@ -384,6 +385,7 @@ public OperationResult accept() {
return operationResult;
}
});
fromFile.setImageEngine(new ThumbnailImage());
return fromFile;
} catch (Exception e) {
newProject();
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/com/commonwealthrobotics/SelectionBox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import eu.mihosoft.vrl.v3d.CSG;
import eu.mihosoft.vrl.v3d.CSGClient;
import eu.mihosoft.vrl.v3d.Cube;
import eu.mihosoft.vrl.v3d.MissingManipulatorException;
import eu.mihosoft.vrl.v3d.Transform;
import eu.mihosoft.vrl.v3d.Vector3d;
import eu.mihosoft.vrl.v3d.ext.quickhull3d.HullUtil;
Expand Down Expand Up @@ -257,7 +258,12 @@ public List<String> checkOverlap(CSG selection2) {
for (CSG key : visible) {
// Check if boxes overlap
if(key.hasManipulator()) {
key=key.transformed(TransformFactory.affineToCSG(key.getManipulator()));
try {
key=key.transformed(TransformFactory.affineToCSG(key.getManipulator()));
} catch (MissingManipulatorException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
if (key.touching(selection2)) {
overlapping.add(key.getName());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/commonwealthrobotics/ShapePalletButtonResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public ShapePalletButtonResources(HashMap<String, String> key, String typeOfShap
for (CSG c : so) {
c.setIsHole(false);
}
image = ThumbnailImage.get(ap.get().getCsgDBinstance(),so);
image = ap.get().getImageEngine().get(ap.get().getCsgDBinstance(),so);

});
while (image == null) {
Expand Down
15 changes: 10 additions & 5 deletions src/main/java/com/commonwealthrobotics/WorkplaneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import eu.mihosoft.vrl.v3d.ColinearPointsException;
import eu.mihosoft.vrl.v3d.Cube;
import eu.mihosoft.vrl.v3d.Cylinder;
import eu.mihosoft.vrl.v3d.MissingManipulatorException;
import eu.mihosoft.vrl.v3d.Polygon;
import eu.mihosoft.vrl.v3d.Transform;
import eu.mihosoft.vrl.v3d.Vector3d;
Expand Down Expand Up @@ -215,8 +216,13 @@ public void handle(MouseEvent ev) {
if(meshesReverseLookup!=null) {
source = meshesReverseLookup.get(meshView);
if(source!=null)
if(source.getManipulator()!=null)
manipulator=source.getManipulator();
if(source.hasManipulator())
try {
manipulator=source.getManipulator();
} catch (MissingManipulatorException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}

TriangleMesh mesh = (TriangleMesh) meshView.getMesh();
Expand Down Expand Up @@ -330,9 +336,8 @@ private TransformNR getFaceNormalAngles(TriangleMesh mesh, int faceIndex) {
try {
Polygon p = Polygon.fromPoints(Arrays.asList(toV(p1),toV(p2),toV(p3)));
return TransformFactory.csgToNR(PolygonUtil.calculateNormalTransform(p));
} catch (ColinearPointsException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (Exception e) {

}
return new TransformNR();
}
Expand Down
Loading