Skip to content

Commit da1e75a

Browse files
committed
examples updated
1 parent d8ee49b commit da1e75a

11 files changed

Lines changed: 10 additions & 26 deletions

File tree

‎examples/basics/CajasOrientadas/CajasOrientadas.pde‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ void setup() {
2929
Scene.inertia = 0.85;
3030
scene = new Scene(this, 200);
3131
scene.togglePerspective();
32-
scene.fit();
3332
esfera = new Node(esfera(10));
3433
esfera.setPosition(new Vector(0, 1.4, 0));
3534
cajas = new Node[15];
@@ -43,7 +42,6 @@ void setup() {
4342
});
4443
scene.randomize(cajas[i]);
4544
}
46-
scene.fit();
4745
scene.tag("keyboard", esfera);
4846
}
4947

@@ -123,7 +121,7 @@ void keyPressed() {
123121
scene.togglePerspective();
124122
}
125123
if (key == 's') {
126-
scene.fit(1);
124+
scene.fit(2000);
127125
}
128126
if (key == 'S') {
129127
scene.fit();

‎examples/basics/KeyFrames/KeyFrames.pde‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import nub.core.*;
1919
import nub.processing.*;
2020

2121
Scene scene;
22-
boolean edit;
2322
Node shape;
2423

2524
// Choose P3D or P2D
@@ -29,7 +28,6 @@ float speed = 1;
2928
void setup() {
3029
size(1000, 700, renderer);
3130
scene = new Scene(this, 150);
32-
scene.fit(1);
3331
PShape pshape;
3432
if (scene.is2D()) {
3533
rectMode(CENTER);
@@ -48,7 +46,7 @@ void setup() {
4846
// Create an initial shape interpolator path
4947
for (int i = 0; i < random(4, 10); i++) {
5048
scene.randomize(shape);
51-
shape.addKeyFrame(Node.AXES | Node.SHAPE, i % 2 == 1 ? 1 : 4);
49+
shape.addKeyFrame(Node.AXES | Node.SHAPE, i % 2 == 1 ? 1000 : 4000);
5250
}
5351
shape.animate();
5452
scene.eye().enableHint(Node.KEYFRAMES);
@@ -93,11 +91,11 @@ void keyPressed() {
9391
shape.animate(speed);
9492
}
9593
if (key == '1')
96-
scene.eye().addKeyFrame(Node.CAMERA | Node.BULLSEYE, 1);
94+
scene.eye().addKeyFrame(Node.CAMERA | Node.BULLSEYE, 1000);
9795
if (key == 'a')
9896
scene.eye().toggleAnimation();
9997
if (key == 'b')
10098
scene.eye().removeKeyFrames();
10199
if (key == 'f')
102-
scene.fit(1);
100+
scene.fit(2000);
103101
}

‎examples/basics/SceneBuffers/SceneBuffers.pde‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ void setup() {
3232
shapes[i] = new Node(caja());
3333
scene.randomize(shapes[i]);
3434
}
35-
scene.fit(1);
3635
}
3736

3837
void draw() {

‎examples/basics/SpaceNavigator/SpaceNavigator.pde‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ void setup() {
3333
size(1600, 800, P3D);
3434
openSpaceNavigator();
3535
scene = new Scene(this, 1500);
36-
scene.fit(1);
3736
Node[] shapes = new Node[50];
3837
for (int i = 0; i < shapes.length; i++) {
3938
tint(random(0,255), random(0,255), random(0,255), random(150,255));

‎examples/demos/CustomEyeInteraction/CustomEyeInteraction.pde‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,8 @@ void setup() {
5252
}
5353

5454
void draw() {
55-
scene.openContext();
5655
background(0);
5756
scene.render();
58-
scene.closeContext();
5957
fill(200);
6058
noStroke();
6159
textureMode(IMAGE);
@@ -91,7 +89,7 @@ void keyPressed(KeyEvent event) {
9189
scene.eye().rotate(Quaternion.from(a, 0, 0));
9290
} else {
9391
scene.lookAt(Vector.zero);
94-
scene.fit(1);
92+
scene.fit(1000);
9593
}
9694
}
9795
if (keyMode) {

‎examples/demos/CustomNodeInteraction/CustomNodeInteraction.pde‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ void settings() {
3434
void setup() {
3535
font36 = loadFont("FreeSans-36.vlw");
3636
scene = new Scene(this);
37-
scene.fit(1);
3837
shapes = new Torus[10];
3938
for (int i = 0; i < shapes.length; i++) {
4039
shapes[i] = new Torus();

‎examples/demos/FlockOfBoids/FlockOfBoids.pde‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Press 'p' to print the current node rate.
2424
* Press 'm' to change the boid visual mode.
2525
* Press 'v' to toggle boids' wall skipping.
26-
* Press 's' to call scene.fit(1).
26+
* Press 's' to call scene.fit(1000).
2727
*/
2828

2929
import nub.primitives.*;
@@ -44,21 +44,18 @@ Node avatar;
4444
void setup() {
4545
size(1000, 700, P3D);
4646
scene = new Scene(this, new Vector(flockWidth / 2, flockHeight / 2, flockDepth / 2), 800);
47-
scene.fit();
4847
// create and fill the list of boids
4948
flock = new ArrayList();
5049
for (int i = 0; i < initBoidNum; i++)
5150
flock.add(new Boid(new Vector(flockWidth / 2, flockHeight / 2, flockDepth / 2)));
5251
}
5352

5453
void draw() {
55-
scene.openContext();
5654
background(10, 50, 25);
5755
ambientLight(128, 128, 128);
5856
directionalLight(255, 255, 255, 0, 1, -100);
5957
walls();
6058
scene.render();
61-
scene.closeContext();
6259
// uncomment to asynchronously update boid avatar. See mouseClicked()
6360
// updateAvatar(scene.node("mouseClicked"));
6461
}
@@ -96,7 +93,7 @@ void updateAvatar(Node node) {
9693
void thirdPerson() {
9794
scene.eye().setReference(avatar);
9895
avatar.setWorldMagnitude(scene.eye());
99-
scene.fit(avatar, 1);
96+
scene.fit(avatar, 1000);
10097
}
10198

10299
// Resets the eye
@@ -105,7 +102,7 @@ void resetEye() {
105102
scene.lookAt(scene.center());
106103
if (avatar != null)
107104
avatar.setMagnitude(1);
108-
scene.fit(1);
105+
scene.fit(1000);
109106
}
110107

111108
// picks up a boid avatar, may be null
@@ -174,7 +171,7 @@ void keyPressed() {
174171
break;
175172
case 's':
176173
if (scene.eye().reference() == null)
177-
scene.fit(1);
174+
scene.fit(1000);
178175
break;
179176
case 'p':
180177
println("Frame rate: " + frameRate);

‎examples/demos/MiniMap/MiniMap.pde‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void keyPressed() {
7171
minimap.untag(scene.eye());
7272
}
7373
if (key == 'f')
74-
focus.fit(1);
74+
focus.fit(1500);
7575
if (key == 't')
7676
focus.togglePerspective();
7777
if (key == 'p')

‎examples/demos/PostEffects/PostEffects.pde‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public void setup() {
3838
models[i] = new Node(shape());
3939
scene.randomize(models[i]);
4040
}
41-
scene.fit(1);
4241
// edge
4342
edgeShader = loadShader("edge.glsl");
4443
edgeGraphics = createGraphics(width, height, P3D);

‎examples/demos/ShadowMapping/ShadowMapping.pde‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ void settings() {
4444
void setup() {
4545
scene = new Scene(this, max(w, h) / 3);
4646
scene.togglePerspective();
47-
scene.fit(1);
4847
Node floor = new Node((PGraphics pg) -> {
4948
pg.pushStyle();
5049
pg.noStroke();

0 commit comments

Comments
 (0)