initialize the base builder with the giturl

.gitignore

@@ -33,4 +33,4 @@ physicsTest
 /test*.stl
 /test.blend1
 /test.*
-*.doodle
+/doodle/

build.gradle

@@ -114,24 +114,18 @@ String getOsArch() {
 	return System.getProperty("os.arch");
 }
 
-//https://oss.sonatype.org/service/local/repositories/releases/content/com/neuronrobotics/nrjavaserial/3.10.1/nrjavaserial-3.10.1.jar
 
 
 repositories {
 	mavenCentral()
 	maven {
-		url 'https://commonwealthrobotics.com/jcenter-mirror/'
+		url 'https://commonwealthrobotics.com/maven/'
 		allowInsecureProtocol = true
 	}
 	maven { url 'https://repo.maven.apache.org/maven2/' }
 
 	maven { url 'https://repo1.maven.org/maven2/'}
 
-	maven { url 'https://oss.sonatype.org/content/repositories/snapshots/'  }
-	//maven { url 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'  }
-	maven { url 'https://oss.sonatype.org/content/repositories/releases/'  }
-	//com.neuronrobotics hosting point
-	maven { url 'https://oss.sonatype.org/content/repositories/staging/' }
 
 //	maven {
 //		url "https://repo.myrobotlab.org/artifactory/myrobotlab/"
@@ -147,7 +141,6 @@ repositories {
 
 	maven { url "https://jitpack.io" }
 	maven { url "https://repo.eclipse.org/content/groups/releases/" }
-	maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
 	maven { url "https://dl.bintray.com/dfki-lt/maven/" }
 	maven { url "https://raw.github.com/marytts/marytts/master/repository/" }
 	maven { url "https://repo.jenkins-ci.org/public/" }
@@ -156,12 +149,11 @@ repositories {
 
 dependencies {
 
-	api 'com.neuronrobotics:JavaCad:2.5.0'
+	//api 'com.neuronrobotics:JavaCad:2.9.5'
+	api project('JCSG')
 	api project('java-bowler')
 	api project('GithubPasswordManager:GithubPasswordManager')
 
-
-
 	//compile group: "de.swirtz", name: "ktsRunner", version: "0.0.7"
 	api 'us.ihmc:jinput:2.0.6-ihmc2'
 	api group: 'us.ihmc', name: 'ihmc-native-library-loader', version: '1.3.1'
@@ -388,47 +380,4 @@ test {
 		exceptionFormat = 'full'
 	}
 }
-/*
- signing {
- sign configurations.archives
- }
- uploadArchives {
- repositories {
- mavenDeployer {
- beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
- repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
- authentication(userName: ossrhUsername, password: ossrhPassword)
- }
- snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
- authentication(userName: ossrhUsername, password: ossrhPassword)
- }
- pom.project {
- name 'Bowler Scripting Kernel'
- packaging 'jar'
- // optionally artifactId can be defined here
- description 'A command line utility for accsing the bowler framework.'
- url 'http://neuronrobotics.com'
- scm {
- connection 			'scm:git:https://github.com/NeuronRobotics/bowler-script-kernel.git'
- developerConnection 'scm:git:[email protected]:NeuronRobotics/bowler-script-kernel.git'
- url 'https://github.com/NeuronRobotics/bowler-script-kernel'
- }
- licenses {
- license {
- name 'The Apache License, Version 2.0'
- url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
- }
- }
- developers {
- developer {
- id 'madhephaestus'
- name 'Kevin Harrington'
- email '[email protected]'
- }
- }
- }
- }
- }
- }
- */
 

build123dTest.py

@@ -0,0 +1,3 @@
+from build123d import *
+
+cube = Box(10, 10, 10)

settings.gradle

@@ -1,2 +1,3 @@
 include 'java-bowler'
+include 'JCSG'
 include 'GithubPasswordManager:GithubPasswordManager'

src/main/java/com/neuronrobotics/bowlerkernel/Bezier3d/Manipulation.java

@@ -40,11 +40,12 @@ public class Manipulation {
 	//private PhongMaterial color;// = new PhongMaterial(getColor());
 	//private PhongMaterial highlight = new PhongMaterial(Color.GOLD);
 
-	private enum DragState {
+	public enum DragState {
 		IDLE, Dragging
 	}
 
 	private DragState state = DragState.IDLE;
+	private boolean resizeAllowed=true;
 
 	public void addEventListener(EventHandler<MouseEvent> r) {
 		if (eventListeners.contains(r))
@@ -75,6 +76,7 @@ private void fireMove(TransformNR trans, MouseEvent event2) {
 		for (Manipulation R : dependants) {
 			R.performMove(trans,event2);
 		}
+		//System.out.println("Mouse event "+event2.getEventType());
 		for (EventHandler<MouseEvent> R : eventListeners) {
 			R.handle(event2);
 		}
@@ -114,6 +116,8 @@ public EventHandler<MouseEvent> getMouseEvents() {
 			@Override
 			public void handle(MouseEvent event) {
 				String name = event.getEventType().getName();
+				if(event.isControlDown())
+					return;
 				switch (name) {
 				case "MOUSE_PRESSED":
 					if(event.isPrimaryButtonDown())
@@ -145,7 +149,7 @@ public void handle(MouseEvent event) {
 	}
 
 	private void pressed(MouseEvent event) {
-		state = DragState.Dragging;
+		setState(DragState.Dragging);
 		new Thread(() -> {
 			event.consume();
 			dragging = false;
@@ -164,12 +168,13 @@ private void release(MouseEvent event) {
 		mouseRelease(event);
 		for (Manipulation R : dependants)
 			R.mouseRelease(event);
-		state = DragState.IDLE;
+		setState(DragState.IDLE);
 		//manip.getMesh().setMaterial(color);
 	}
 
 	private void dragged(MouseEvent event, MouseEvent event2) {
-		if(state==DragState.Dragging) {
+		if(resizeAllowed)
+		if(getState()==DragState.Dragging) {
 			getUi().runLater(() -> {
 				setDragging(event);
 				double deltx = (startx - event.getScreenX());
@@ -189,7 +194,7 @@ private void dragged(MouseEvent event, MouseEvent event2) {
 	}
 
 	public boolean isMoving() {
-		return state == DragState.Dragging;
+		return getState() == DragState.Dragging;
 	}
 
 	private void mouseRelease(MouseEvent event) {
@@ -253,7 +258,7 @@ private double round(double in) {
 		return Math.round(in / increment) * increment;
 	}
 
-	private void setGlobal(TransformNR global) {
+	public void setGlobal(TransformNR global) {
 //		newx = global.getX();
 //		newy = global.getY();
 //		newz = global.getZ();
@@ -272,7 +277,15 @@ public static IInteractiveUIElementProvider getUi() {
 	public static void setUi(IInteractiveUIElementProvider ui) {
 		Manipulation.ui = ui;
 	}
-
+	public void reset() {
+		newx = 0;
+		newy = 0;
+		newz = 0;
+		getGlobalPose().setX(0);
+		getGlobalPose().setY(0);
+		getGlobalPose().setZ(0);
+		setGlobal(new TransformNR(0, 0, 0, new RotationNR()));
+	}
 	public void set(double newX, double newY, double newZ) {
 		newx = newX;
 		newy = newY;
@@ -298,11 +311,6 @@ public void setInReferenceFrame(double newX, double newY, double newZ) {
 		}
 
 	}
-	public void reset() {
-		// Auto-generated method stub
-
-	}
-
 	public TransformNR getGlobalPose() {
 		return globalPose;
 	}
@@ -352,4 +360,16 @@ public void setFrameOfReference(IFrameProvider frameOfReference) {
 		this.frameOfReference = frameOfReference;
 	}
 
+	public void setUnlocked(boolean resizeAllowed) {
+		this.resizeAllowed = resizeAllowed;		
+	}
+
+	public DragState getState() {
+		return state;
+	}
+
+	public void setState(DragState state) {
+		this.state = state;
+	}
+
 }