Skip to content

Commit ed36bcb

Browse files
monkstonemonkstone
committed
tidy up
1 parent fc0a644 commit ed36bcb

19 files changed

+58
-56
lines changed

‎basics/form/rgb_cube.rb

+35-38
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,69 @@
1+
#!/usr/bin/env jruby
2+
# frozen_string_literal: true
3+
14
require 'picrate'
5+
require 'arcball'
6+
java_import 'monkstone.vecmath.GfxRender'
27
# RGB Cube.
38
#
49
# The three primary colors of the additive color model are red, green, and blue.
510
# This RGB color cube displays smooth transitions between these colors.
611
class RgbCube < Processing::App
7-
812
attr_reader :box_points
913

1014
def setup
1115
sketch_title 'RGB Cube'
1216
no_stroke
13-
color_mode RGB, 2
14-
@xmag = 0
15-
@ymag = 0
16-
@new_xmag = 0
17-
@new_ymag = 0
18-
# Math.since each point is used three times
17+
Processing::ArcBall.init(self, width / 2, height / 2)
18+
1919
@box_points = {
20-
top_front_left: [-1, 1, 1],
21-
top_front_right: [1, 1, 1],
22-
top_back_right: [1, 1, -1],
23-
top_back_left: [-1, 1, -1],
24-
bottom_front_left: [-1, -1, 1],
25-
bottom_front_right: [1, -1, 1],
26-
bottom_back_right: [1, -1, -1],
27-
bottom_back_left: [-1, -1, -1]
20+
top_front_left: Vec3D.new(-90, 90, 90),
21+
top_front_right: Vec3D.new(90, 90, 90),
22+
top_back_right: Vec3D.new(90, 90, -90),
23+
top_back_left: Vec3D.new(-90, 90, -90),
24+
bottom_front_left: Vec3D.new(-90, -90, 90),
25+
bottom_front_right: Vec3D.new(90, -90, 90),
26+
bottom_back_right: Vec3D.new(90, -90, -90),
27+
bottom_back_left: Vec3D.new(-90, -90, -90)
2828
}
2929
# a box from defined points
3030
@box = {
31-
top: [box_points[:top_front_left], box_points[:top_front_right], box_points[:top_back_right], box_points[:top_back_left]],
32-
front: [box_points[:top_front_left], box_points[:top_front_right], box_points[:bottom_front_right], box_points[:bottom_front_left]],
33-
left: [box_points[:top_front_left], box_points[:bottom_front_left], box_points[:bottom_back_left], box_points[:top_back_left]],
34-
back: [box_points[:top_back_left], box_points[:top_back_right], box_points[:bottom_back_right], box_points[:bottom_back_left]],
35-
right: [box_points[:top_back_right], box_points[:bottom_back_right], box_points[:bottom_front_right], box_points[:top_front_right]],
36-
bottom: [box_points[:bottom_front_left], box_points[:bottom_front_right], box_points[:bottom_back_right], box_points[:bottom_back_left]]
31+
top: [box_points[:top_front_left], box_points[:top_front_right], box_points[:top_back_right],
32+
box_points[:top_back_left]],
33+
front: [box_points[:top_front_left], box_points[:top_front_right], box_points[:bottom_front_right],
34+
box_points[:bottom_front_left]],
35+
left: [box_points[:top_front_left], box_points[:bottom_front_left], box_points[:bottom_back_left],
36+
box_points[:top_back_left]],
37+
back: [box_points[:top_back_left], box_points[:top_back_right], box_points[:bottom_back_right],
38+
box_points[:bottom_back_left]],
39+
right: [box_points[:top_back_right], box_points[:bottom_back_right], box_points[:bottom_front_right],
40+
box_points[:top_front_right]],
41+
bottom: [box_points[:bottom_front_left], box_points[:bottom_front_right], box_points[:bottom_back_right],
42+
box_points[:bottom_back_left]]
3743
}
3844
end
3945

4046
def draw
4147
background 1
42-
push_matrix
43-
translate width / 2, height / 2, -30
44-
@new_xmag = mouse_x.to_f / width * TAU
45-
@new_ymag = mouse_y.to_f / height * TAU
46-
diff = @xmag - @new_xmag
47-
@xmag -= diff / 4 if diff.abs > 0.01
48-
diff = @ymag - @new_ymag
49-
@ymag -= diff / 4 if diff.abs > 0.01
50-
rotate_x(-@ymag)
51-
rotate_y(-@xmag)
52-
scale 90
5348
begin_shape QUADS
54-
%i(top front left back right bottom).each do |s|
49+
%i[top front left back right bottom].each do |s|
5550
@box[s].each do |p|
5651
fill_from_points p
57-
vertex_from_points p
52+
p.to_vertex(renderer)
5853
end
5954
end
6055
end_shape
61-
pop_matrix
6256
end
6357

6458
def fill_from_points(points)
65-
fill points[0] + 1, points[1] + 1, points[2] + 1 # "+1" translates -1,1 to 0,2
59+
red = map1d(points.x, -90..90, 0..255)
60+
blue = map1d(points.y, -90..90, 0..255)
61+
green = map1d(points.z, -90..90, 0..255)
62+
fill(red, blue, green)
6663
end
6764

68-
def vertex_from_points(points)
69-
vertex(*points)
65+
def renderer
66+
@renderer ||= GfxRender.new(g)
7067
end
7168

7269
def settings

‎basics/form/shape_transform.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ShapeTransform < Processing::App
1616

1717
def setup
1818
sketch_title 'Shape Transform'
19-
@renderer = GfxRender.new(self.g)
19+
@renderer = GfxRender.new(g)
2020
no_stroke
2121
@angle_inc = PI / 300
2222
@pts = 4

‎basics/form/toroid.rb

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#!/usr/bin/env jruby
2+
# frozen_string_literal: true
3+
14
require 'picrate'
25
# Interactive Toroid
36
# by Ira Greenberg.
@@ -108,7 +111,7 @@ def settings
108111
end
109112

110113
def renderer
111-
@renderer ||= GfxRender.new(self.g)
114+
@renderer ||= GfxRender.new(g)
112115
end
113116
end
114117

‎contributed/cairo_tiling.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def setup
2424

2525
# An example of GfxRenderer usage for Vec3D => vertex conversion
2626
def renderer
27-
@renderer ||= GfxRender.new(self.g)
27+
@renderer ||= GfxRender.new(g)
2828
end
2929

3030
def composite_tile(x, y, s)

‎contributed/mycelium.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Mycelium < Processing::App
1010
attr_reader :renderer, :root
1111

1212
def setup
13-
@renderer = GfxRender.new(self.g)
13+
@renderer = GfxRender.new(g)
1414
@root = Branch.new(
1515
self,
1616
Vec2D.new(0, height / 2),

‎contributed/mycelium_box.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class MyceliumBox < Processing::App
1212
def setup
1313
sketch_title 'Mycelium Box'
1414
Processing::ArcBall.init self
15-
@renderer = GfxRender.new(self.g)
15+
@renderer = GfxRender.new(g)
1616
@root = Branch.new(
1717
self,
1818
Vec3D.new(0, 10, 10),

‎contributed/pentaflake.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def draw_pentagon(pent)
3838
end
3939

4040
def renderer
41-
@renderer ||= GfxRender.new(self.g)
41+
@renderer ||= GfxRender.new(g)
4242
end
4343
end
4444

‎demo/elegant_ball.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def draw
3636
end
3737

3838
def renderer
39-
@renderer ||= GfxRender.new(self.g)
39+
@renderer ||= GfxRender.new(g)
4040
end
4141

4242
# Generate a vector whose components change smoothly over time in the range

‎demo/mycelium.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Mycelium < Processing::App
1010
attr_reader :renderer, :root
1111

1212
def setup
13-
@renderer = GfxRender.new(self.g)
13+
@renderer = GfxRender.new(g)
1414
@root = Branch.new(
1515
self,
1616
Vec2D.new(0, height / 2),

‎demo/mycelium_box.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class MyceliumBox < Processing::App
1212
def setup
1313
sketch_title 'Mycelium Box'
1414
Processing::ArcBall.init self
15-
@renderer = GfxRender.new(self.g)
15+
@renderer = GfxRender.new(g)
1616
@root = Branch.new(
1717
self,
1818
Vec3D.new(0, 10, 10),

‎demo/ribbon_doodle.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def mouse_moved
8888
end
8989

9090
def renderer
91-
@renderer ||= GfxRender.new(self.g)
91+
@renderer ||= GfxRender.new(g)
9292
end
9393
end
9494

‎library/vecmath/vec2d/circumcircle_sketch.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def setup
3535
@font = create_font('Liberation Sans', 16, true)
3636
@points = TPoints.new
3737
ellipse_mode RADIUS
38-
@renderer = GfxRender.new(self.g)
38+
@renderer = GfxRender.new(g)
3939
end
4040

4141
def draw

‎library/vecmath/vec2d/morph.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def draw
7777
end
7878

7979
def renderer
80-
@renderer = GfxRender.new(self.g)
80+
@renderer = GfxRender.new(g)
8181
end
8282

8383
def settings

‎library/vecmath/vec2d/soft_body.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def draw
4040
end
4141

4242
def renderer
43-
@renderer ||= GfxRender.new(self.g)
43+
@renderer ||= GfxRender.new(g)
4444
end
4545

4646
def draw_shape

‎library/vecmath/vec3d/drawolver.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def draw
4747
end
4848

4949
def renderer
50-
@renderer ||= GfxRender.new(self.g)
50+
@renderer ||= GfxRender.new(g)
5151
end
5252

5353
def reset_scene

‎library/vecmath/vec3d/frame_of_reference.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
#!/usr/bin/env jruby
12
# frozen_string_literal: true
3+
24
require 'picrate'
35
require 'arcball'
46
require_relative 'library/geometry/geometry'
@@ -114,7 +116,7 @@ def draw
114116
end
115117

116118
def renderer
117-
@renderer ||= GfxRender.new(self.g)
119+
@renderer ||= GfxRender.new(g)
118120
end
119121
end
120122

‎library/vecmath/vec3d/terrain.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def mouse_pressed
6666
private
6767

6868
def renderer
69-
@renderer ||= GfxRender.new(self.g)
69+
@renderer ||= GfxRender.new(g)
7070
end
7171
end
7272

‎lsystems/moore_curve.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def render(points)
3333
end
3434

3535
def renderer
36-
@renderer ||= GfxRender.new(self.g)
36+
@renderer ||= GfxRender.new(g)
3737
end
3838

3939
def settings

‎lsystems/peano.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def render(points)
3333
end
3434

3535
def renderer
36-
@renderer ||= GfxRender.new(self.g)
36+
@renderer ||= GfxRender.new(g)
3737
end
3838

3939
def settings

0 commit comments

Comments
 (0)