Skip to content

Commit 1dc274a

Browse files
Updated ruby gems and added gibbon model
1 parent 525d9a2 commit 1dc274a

File tree

5 files changed

+22434
-26
lines changed

5 files changed

+22434
-26
lines changed

Gemfile.lock

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.1)
4+
addressable (2.8.6)
55
public_suffix (>= 2.0.2, < 6.0)
66
colorator (1.1.0)
7-
concurrent-ruby (1.1.10)
7+
concurrent-ruby (1.2.2)
88
em-websocket (0.5.3)
99
eventmachine (>= 0.12.9)
1010
http_parser.rb (~> 0)
1111
eventmachine (1.2.7)
12-
ffi (1.15.5)
12+
ffi (1.16.3)
1313
forwardable-extended (2.6.0)
14+
google-protobuf (3.25.1)
1415
http_parser.rb (0.8.0)
15-
i18n (1.12.0)
16+
i18n (1.14.1)
1617
concurrent-ruby (~> 1.0)
17-
jekyll (4.3.1)
18+
jekyll (4.3.2)
1819
addressable (~> 2.4)
1920
colorator (~> 1.0)
2021
em-websocket (~> 0.5)
@@ -30,34 +31,36 @@ GEM
3031
safe_yaml (~> 1.0)
3132
terminal-table (>= 1.8, < 4.0)
3233
webrick (~> 1.7)
33-
jekyll-sass-converter (2.2.0)
34-
sassc (> 2.0.1, < 3.0)
34+
jekyll-sass-converter (3.0.0)
35+
sass-embedded (~> 1.54)
3536
jekyll-watch (2.2.1)
3637
listen (~> 3.0)
3738
kramdown (2.4.0)
3839
rexml
3940
kramdown-parser-gfm (1.1.0)
4041
kramdown (~> 2.0)
41-
liquid (4.0.3)
42-
listen (3.7.1)
42+
liquid (4.0.4)
43+
listen (3.8.0)
4344
rb-fsevent (~> 0.10, >= 0.10.3)
4445
rb-inotify (~> 0.9, >= 0.9.10)
4546
mercenary (0.4.0)
4647
pathutil (0.16.2)
4748
forwardable-extended (~> 2.6)
48-
public_suffix (5.0.0)
49+
public_suffix (5.0.4)
50+
rake (13.1.0)
4951
rb-fsevent (0.11.2)
5052
rb-inotify (0.10.1)
5153
ffi (~> 1.0)
52-
rexml (3.2.5)
53-
rouge (4.0.0)
54+
rexml (3.2.6)
55+
rouge (4.2.0)
5456
safe_yaml (1.0.5)
55-
sassc (2.4.0)
56-
ffi (~> 1.9)
57+
sass-embedded (1.69.5)
58+
google-protobuf (~> 3.23)
59+
rake (>= 13.0.0)
5760
terminal-table (3.0.2)
5861
unicode-display_width (>= 1.1.1, < 3)
59-
unicode-display_width (2.3.0)
60-
webrick (1.7.0)
62+
unicode-display_width (2.5.0)
63+
webrick (1.8.1)
6164

6265
PLATFORMS
6366
ruby

index.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,24 @@
2525
</a-marker>
2626

2727
<!-- Spur gear pair -->
28-
<a-marker type='barcode' value='489'>
28+
<a-marker type='barcode' value='489'>
2929
<a-entity scale="0.5 0.5 0.5" position="0 0 0">
30-
30+
3131
<a-entity obj-model="obj: url(/models/spur_gear_m2_N20_core_r6.obj); mtl: url(/models/spur_gear_m2_N20_core_r6.mtl)"
3232
position="0 0 0" rotation="0 0 0" animation="property: rotation; to: 0 -720 0; loop: true; dur: 10000">
3333
</a-entity>
3434
<a-entity obj-model="obj: url(/models/spur_gear_m2_N10_core_r6.obj); mtl: url(/models/spur_gear_m2_N10_core_r6.mtl)"
3535
position="1.5 0 0" rotation="0 0 0" animation="property: rotation; to: 0 1440 0; loop: true; dur: 10000">
36-
</a-entity>
36+
</a-entity>
3737

38-
</a-entity>
38+
</a-entity>
3939
</a-entity>
4040
</a-marker>
4141

4242
<!-- Planetary gear, static carrier -->
43-
<a-marker type='barcode' value='25'>
43+
<a-marker type='barcode' value='25'>
4444
<a-entity scale="0.5 0.5 0.5" position="0 0 0">
45-
45+
4646
<a-entity obj-model="obj: url(/models/spur_gear_m2_N20_core_r6.obj); mtl: url(/models/spur_gear_m2_N20_core_r6.mtl)"
4747
position="0 0 0" rotation="0 0 0" animation="property: rotation; to: 0 -720 0; loop: true; dur: 10000">
4848
</a-entity>
@@ -63,7 +63,7 @@
6363
</a-marker>
6464

6565
<!-- Planetary gear, static sun -->
66-
<a-marker type='barcode' value='180'>
66+
<a-marker type='barcode' value='180'>
6767
<a-entity scale="0.5 0.5 0.5" position="0 0 0" rotation="0 0 0" animation="property: rotation; to: 0 720 0; loop: true; dur: 10000">
6868

6969
<a-entity obj-model="obj: url(/models/spur_gear_m2_N20_core_r6.obj); mtl: url(/models/spur_gear_m2_N20_core_r6.mtl)"
@@ -86,7 +86,7 @@
8686
</a-marker>
8787

8888
<!-- Planetary gear, static ring -->
89-
<a-marker type='barcode' value='143'>
89+
<a-marker type='barcode' value='143'>
9090
<a-entity scale="0.5 0.5 0.5" position="0 0 0" rotation="0 0 0" animation="property: rotation; to: 0 -360 0; loop: true; dur: 10000">
9191

9292
<a-entity obj-model="obj: url(/models/spur_gear_m2_N20_core_r6.obj); mtl: url(/models/spur_gear_m2_N20_core_r6.mtl)"
@@ -106,8 +106,8 @@
106106
</a-entity>
107107

108108
</a-entity>
109-
</a-marker>
110-
109+
</a-marker>
110+
111111
<a-entity camera></a-entity>
112112
</a-scene>
113113
</body>

models/gibbon.mtl

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Blender 3.5.1 MTL File: 'None'
2+
# www.blender.org
3+
4+
newmtl gibbon
5+
Ns 0.000000
6+
Ka 1 1 1
7+
Kd 1 1 1
8+
Ks 0 0 0
9+
illum 1
10+
Ns 0
11+
Ni 1.450000
12+
d 1
13+
Tr 0
14+
map_Kd gibbon.png
15+
map_d gibbon.png

0 commit comments

Comments
 (0)