Fix demo window sizes (#131)

tzaeschke · Oct 5, 2023 · b3e2937 · b3e2937
1 parent b65955e
commit b3e2937
Show file tree

Hide file tree

Showing 49 changed files with 49 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@
 ## unreleased
 - Fix DVector3.cross() returning always 0. [#128](https://github.com/tzaeschke/ode4j/issues/128)
 - Fix JUnit test lint. [#130](https://github.com/tzaeschke/ode4j/pull/130)
+- Fix Demo window size to minimum 640x480. [#131](https://github.com/tzaeschke/ode4j/pull/131)
 
 ## 0.5.1 - 2023-09-17
 - Support for HiDPI screens / Apple Silicon/Retina. Contribution by valb3r,

diff --git a/core/src/test/java/org/ode4j/ode/old/BugsTest.java b/core/src/test/java/org/ode4j/ode/old/BugsTest.java
@@ -89,7 +89,7 @@ public void testBodyDampening() {
 		}
 
 		/* run simulation */
-//		dsSimulationLoop (args,352,288,this);
+//		dsSimulationLoop (args,640,480,this);
 
 		contactgroup.destroy();
 		space.destroy();

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoBuggy.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoBuggy.java
@@ -392,7 +392,7 @@ private void demo(String[] args) {
 		dGeomSetRotation (ground_box,R);
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dGeomDestroy (box[0]);
 		dGeomDestroy (sphere[0]);

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoChain1.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoChain1.java
@@ -217,7 +217,7 @@ private void demo(String[] args) {
 		}
 
 		/* run simulation */
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dJointGroupDestroy (contactgroup);
 		dSpaceDestroy (space);

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoChain2.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoChain2.java
@@ -201,7 +201,7 @@ private void demo(String[] args) {
 		}
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dCloseODE();
 	}

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoCrash.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoCrash.java
@@ -723,7 +723,7 @@ private void demo(String[] args) {
 		resetSimulation();
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dJointGroupDestroy (contactgroup);
 		dSpaceDestroy (space);

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoCyl.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoCyl.java
@@ -399,7 +399,7 @@ private void demo(String [] args) {
 		reset_state();
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dJointGroupEmpty (contactgroup);
 		dJointGroupDestroy (contactgroup);

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoCylVsSphere.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoCylVsSphere.java
@@ -291,7 +291,7 @@ private void demo(String[] args) {
 		dSpaceAdd (space, sphgeom);
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dJointGroupEmpty (contactgroup);
 		dJointGroupDestroy (contactgroup);

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoFeedback.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoFeedback.java
@@ -375,7 +375,7 @@ private void demo(String[] args) {
 			colours[i]=0.0;
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dJointGroupEmpty (contactgroup);
 		dJointGroupDestroy (contactgroup);

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoFriction.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoFriction.java
@@ -237,7 +237,7 @@ private void demo(String[] args) {
 		}
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dJointGroupDestroy (contactgroup);
 		dSpaceDestroy (space);

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoHeightfield.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoHeightfield.java
@@ -943,7 +943,7 @@ private void demo(String[] args) {
 		dGeomSetPosition( gheight, pos.get0(), pos.get1(), pos.get2() );
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dJointGroupDestroy (contactgroup);
 		dSpaceDestroy (space);

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoHinge.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoHinge.java
@@ -215,7 +215,7 @@ private void demo(String[] args) {
 		// run simulation
 		//	  dsSimulationLoop (argc,argv,352,288,&fn);
 //		dsSimulationLoop (args,352,288,fn);
-		dsSimulationLoop (args,400,400,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dWorldDestroy (world);
 		dCloseODE();

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoI.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoI.java
@@ -301,7 +301,7 @@ private void demo(String[] args) {
 		reset_test();
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dWorldDestroy (world);
 		dCloseODE();

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoJoints.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoJoints.java
@@ -1140,7 +1140,7 @@ private void doTest (String[] args, int n, int fatal_if_bad_n)
 
 		// run simulation
 		if (cmd_graphics) {
-			dsSimulationLoop (args,352,288,this);
+			dsSimulationLoop (args,640,480,this);
 			//dsSimulationLoop (args,288,288,fn);
 			//dsSimulationLoop (args,400,400,fn);
 		}

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoMotion.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoMotion.java
@@ -627,7 +627,7 @@ private void demo(String[] args) {
 		dGeomSetCollideBits(platform, ~1l);
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dJointGroupDestroy (contactgroup);
 		dSpaceDestroy (space);

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoMotor.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoMotor.java
@@ -274,7 +274,7 @@ private void demo(String[] args) {
 		}
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dJointGroupDestroy(contactgroup);
 		dSpaceDestroy (space);

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoPiston.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoPiston.java
@@ -832,7 +832,7 @@ private void demo(String[] args) {
 
 
 		// run simulation
-		dsSimulationLoop (args,400,300,this);
+		dsSimulationLoop (args,640,480,this);
 
 		//delete joint;
 		dJointGroupDestroy (contactgroup);

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoSlider.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoSlider.java
@@ -217,7 +217,7 @@ private void demo(String[] args) {
 		dJointSetSliderAxis (slider,1,1,1);
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dWorldDestroy (world);
 		dCloseODE();

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoSpace.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoSpace.java
@@ -253,7 +253,7 @@ private void demo(String[] args) {
 		init_test();
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dSpaceDestroy (space);
 		dCloseODE();

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoSpaceStress.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoSpaceStress.java
@@ -543,7 +543,7 @@ private void demo(String[] args) {
 		}
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dJointGroupDestroy (contactgroup);
 		dSpaceDestroy (space);

diff --git a/demo-cpp/src/main/java/org/ode4j/democpp/DemoStep.java b/demo-cpp/src/main/java/org/ode4j/democpp/DemoStep.java
@@ -218,7 +218,7 @@ private void demo(String[] args) {
 		createTest();
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		dWorldDestroy (world);
 		dCloseODE();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoBasket.java b/demo/src/main/java/org/ode4j/demo/DemoBasket.java
@@ -266,7 +266,7 @@ private void demo(String[] args)
 		space.add (sphgeom);
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		// Causes segm violation? Why?
 		// (because dWorldDestroy() destroys body connected to geom; must call first!)

diff --git a/demo/src/main/java/org/ode4j/demo/DemoBasketConvex.java b/demo/src/main/java/org/ode4j/demo/DemoBasketConvex.java
@@ -271,7 +271,7 @@ private void demo(String[] args)
 		space.add (sphgeom);
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		// Causes segm violation? Why?
 		// (because dWorldDestroy() destroys body connected to geom; must call first!)

diff --git a/demo/src/main/java/org/ode4j/demo/DemoBuggy.java b/demo/src/main/java/org/ode4j/demo/DemoBuggy.java
@@ -305,7 +305,7 @@ private void demo(String[] args) {
 		ground_box.setRotation(R);
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		box[0].destroy();
 		sphere[0].destroy();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoBuoyancy.java b/demo/src/main/java/org/ode4j/demo/DemoBuoyancy.java
@@ -331,7 +331,7 @@ private void demo (String[] args) {
         for (int i = 0; i < obj.length; i++) obj[i] = new MyObject();
         OdeHelper.createPlane( space, 0, 0, 1, 0 );
 
-        dsSimulationLoop (args,352,288,this);
+        dsSimulationLoop (args,640,480,this);
         contactgroup.destroy ();
         space.destroy ();
         world.destroy ();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoChain1.java b/demo/src/main/java/org/ode4j/demo/DemoChain1.java
@@ -174,7 +174,7 @@ private void demo(String[] args) {
 		}
 
 		/* run simulation */
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		contactgroup.destroy();
 		space.destroy();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoChain2.java b/demo/src/main/java/org/ode4j/demo/DemoChain2.java
@@ -176,7 +176,7 @@ private void demo(String[] args) {
 		}
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		OdeHelper.closeODE();
 	}

diff --git a/demo/src/main/java/org/ode4j/demo/DemoCrash.java b/demo/src/main/java/org/ode4j/demo/DemoCrash.java
@@ -675,7 +675,7 @@ private void demo(String[] args) {
 		setupSimulation();
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		shutdownSimulation();
 		OdeHelper.closeODE();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoCyl.java b/demo/src/main/java/org/ode4j/demo/DemoCyl.java
@@ -287,7 +287,7 @@ private void demo(String [] args) {
 		reset_state();
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		contactgroup.empty();
 		contactgroup.destroy();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoCylVsSphere.java b/demo/src/main/java/org/ode4j/demo/DemoCylVsSphere.java
@@ -228,7 +228,7 @@ private void demo(String[] args) {
 		space.add (sphgeom);
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		contactgroup.empty();
 		contactgroup.destroy();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoFriction.java b/demo/src/main/java/org/ode4j/demo/DemoFriction.java
@@ -196,7 +196,7 @@ private void demo(String[] args) {
 		}
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		contactgroup.destroy();
 		space.destroy();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoGyro2.java b/demo/src/main/java/org/ode4j/demo/DemoGyro2.java
@@ -205,7 +205,7 @@ private void demo(String[] args) {
 		reset();
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		clear();
 		OdeHelper.closeODE();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoGyroscopic.java b/demo/src/main/java/org/ode4j/demo/DemoGyroscopic.java
@@ -235,7 +235,7 @@ private void demo(String[] args) {
 		reset();
 
 		// run simulation
-		dsSimulationLoop (args,512,384,this);
+		dsSimulationLoop (args,640,480,this);
 
 		g1.DESTRUCTOR();//delete g1;
 		g2.DESTRUCTOR();//delete g2;

diff --git a/demo/src/main/java/org/ode4j/demo/DemoHeightfield.java b/demo/src/main/java/org/ode4j/demo/DemoHeightfield.java
@@ -675,7 +675,7 @@ private void demo(String[] args) {
 //	    world.setStepThreadingImplementation(threading.dThreadingImplementationGetFunctions(), threading);
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 //	    threading.shutdownProcessing();//dThreadingImplementationShutdownProcessing(threading);
 //	    pool.freeThreadPool();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoHinge.java b/demo/src/main/java/org/ode4j/demo/DemoHinge.java
@@ -174,7 +174,7 @@ private void demo(String[] args) {
 		// run simulation
 		//	  dsSimulationLoop (argc,argv,352,288,&fn);
 //		dsSimulationLoop (args,352,288,fn);
-		dsSimulationLoop (args,400,400,this);
+		dsSimulationLoop (args,640,480,this);
 
 		world.destroy ();
 		OdeHelper.closeODE();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoI.java b/demo/src/main/java/org/ode4j/demo/DemoI.java
@@ -243,7 +243,7 @@ private void demo(String[] args) {
 		reset_test();
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		world.destroy ();
 		OdeHelper.closeODE();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoJointPR.java b/demo/src/main/java/org/ode4j/demo/DemoJointPR.java
@@ -433,7 +433,7 @@ private void demo(String[] args) {
 		box1_space.add(box1);
 
 		// run simulation
-		dsSimulationLoop (args,400,300,this);
+		dsSimulationLoop (args,640,480,this);
 		contactgroup.destroy ();
 		space.destroy ();
 		world.destroy ();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoJointPU.java b/demo/src/main/java/org/ode4j/demo/DemoJointPU.java
@@ -743,7 +743,7 @@ private void demo(String[] args) {
 
 
 		// run simulation
-		dsSimulationLoop (args,400,300,this);
+		dsSimulationLoop (args,640,480,this);
 
 		//delete joint;
 		//joint.DESTRUCTOR();  //TZ, not necessary, is deleted from dWorldDestroy()

diff --git a/demo/src/main/java/org/ode4j/demo/DemoJoints.java b/demo/src/main/java/org/ode4j/demo/DemoJoints.java
@@ -1077,9 +1077,7 @@ private void doTest (String[] args, int n, int fatal_if_bad_n) {
 
 		// run simulation
 		if (cmd_graphics) {
-			dsSimulationLoop (args,352,288,this);
-			//dsSimulationLoop (args,288,288,fn);
-			//dsSimulationLoop (args,400,400,fn);
+			dsSimulationLoop (args,640,480,this);
 		}
 		else {
 			for (int i=0; i < max_iterations; i++) step (false);

diff --git a/demo/src/main/java/org/ode4j/demo/DemoLayeredTrimeshHeightfield.java b/demo/src/main/java/org/ode4j/demo/DemoLayeredTrimeshHeightfield.java
@@ -690,7 +690,7 @@ private void demo(String[] args) {
 //	    world.setStepThreadingImplementation(threading.dThreadingImplementationGetFunctions(), threading);
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 //	    threading.shutdownProcessing();//dThreadingImplementationShutdownProcessing(threading);
 //	    pool.freeThreadPool();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoMotion.java b/demo/src/main/java/org/ode4j/demo/DemoMotion.java
@@ -528,7 +528,7 @@ private void demo(String[] args) {
 		platform.setCollideBits(~1l);
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		contactgroup.destroy ();
 		space.destroy ();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoMotor.java b/demo/src/main/java/org/ode4j/demo/DemoMotor.java
@@ -222,7 +222,7 @@ private void demo(String[] args) {
 		}
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		contactgroup.destroy();
 		space.destroy ();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoRFriction.java b/demo/src/main/java/org/ode4j/demo/DemoRFriction.java
@@ -274,7 +274,7 @@ private void demo(String[] args) {
 		reset();
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		clear();
 		OdeHelper.closeODE();

diff --git a/demo/src/main/java/org/ode4j/demo/DemoSlider.java b/demo/src/main/java/org/ode4j/demo/DemoSlider.java
@@ -168,7 +168,7 @@ private void demo(String[] args) {
 		slider.setAxis (1,1,1);
 
 		// run simulation
-		dsSimulationLoop (args,352,288,this);
+		dsSimulationLoop (args,640,480,this);
 
 		world.destroy ();
 		OdeHelper.closeODE();