Skip to content

Commit 71fa364

Browse files
Merge pull request #127 from VCityTeam/zeppelin-tour
Zeppelin tour
2 parents e0961b4 + 09466c1 commit 71fa364

22 files changed

+4600
-1705
lines changed

client/assets/config/config_editor.json

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
}
2828
},
2929
"css": {
30-
"localGameManager": {
31-
"path": "./assets/css/localGameManager.css"
30+
"controller": {
31+
"path": "./assets/css/controller.css"
3232
},
3333
"ui": {
3434
"path": "./assets/css/ui.css"
@@ -61,8 +61,8 @@
6161
"image": {
6262
"path": "./assets/localScripts/Image.js"
6363
},
64-
"localGameManager": {
65-
"path": "./assets/localScripts/LocalGameManager.js"
64+
"controller": {
65+
"path": "./assets/localScripts/Controller.js"
6666
},
6767
"bbb": {
6868
"path": "./assets/localScripts/BBB.js"
@@ -85,6 +85,9 @@
8585
"default_interactions": {
8686
"path": "./assets/localScripts/DefaultInteractions.js"
8787
},
88+
"zeppelin_start": {
89+
"path": "./assets/localScripts/ZeppelinStart.js"
90+
},
8891
"signage_displayer": {
8992
"path": "./assets/localScripts/SignageDisplayer.js"
9093
},
@@ -121,7 +124,8 @@
121124
},
122125
"zeppelin": {
123126
"path": "./assets/models/Zeppelin_Labex_IMU.glb",
124-
"anchor": "center_min"
127+
"anchor": "center_min",
128+
"rotation": { "x": 0, "y": 1.5707, "z": 0 }
125129
},
126130
"studio_imu_A": {
127131
"path": "./assets/models/Studio_IMU_A.glb"
@@ -157,6 +161,9 @@
157161
}
158162
},
159163
"prefabs": {
164+
"zeppelin_start": {
165+
"path": "./assets/prefabs/ZeppelinStart.json"
166+
},
160167
"avatar": {
161168
"path": "./assets/prefabs/Avatar.json"
162169
},

client/assets/config/config_game.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
}
3131
},
3232
"css": {
33-
"localGameManager": {
34-
"path": "./assets/css/localGameManager.css"
33+
"controller": {
34+
"path": "./assets/css/controller.css"
3535
},
3636
"ui": {
3737
"path": "./assets/css/ui.css"
@@ -49,6 +49,9 @@
4949
"static_object": {
5050
"path": "./assets/localScripts/StaticObject.js"
5151
},
52+
"zeppelin_start": {
53+
"path": "./assets/localScripts/ZeppelinStart.js"
54+
},
5255
"video": {
5356
"path": "./assets/localScripts/Video.js"
5457
},
@@ -64,8 +67,8 @@
6467
"texture_face": {
6568
"path": "./assets/localScripts/TextureFace.js"
6669
},
67-
"localGameManager": {
68-
"path": "./assets/localScripts/LocalGameManager.js"
70+
"controller": {
71+
"path": "./assets/localScripts/Controller.js"
6972
},
7073
"bbb": {
7174
"path": "./assets/localScripts/BBB.js"
@@ -124,7 +127,8 @@
124127
},
125128
"zeppelin": {
126129
"path": "./assets/models/Zeppelin_Labex_IMU.glb",
127-
"anchor": "center_min"
130+
"anchor": "center_min",
131+
"rotation": { "x": 0, "y": 1.5707, "z": 0 }
128132
},
129133
"studio_imu_A": {
130134
"path": "./assets/models/Studio_IMU_A.glb"

client/assets/css/localGameManager.css renamed to client/assets/css/controller.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/** @format */
22

3-
.label_localGameManager {
3+
.label_controller {
44
color: red;
55
}
66

7-
.splash_localGameManager {
7+
.splash_controller {
88
position: absolute;
99
width: 100%;
1010
height: 100%;
@@ -14,14 +14,14 @@
1414
align-items: center;
1515
}
1616

17-
.label_splash_localGameManager {
17+
.label_splash_controller {
1818
opacity: unset;
1919
font-size: xxx-large;
2020
z-index: 1;
2121
font-family: sans-serif;
2222
}
2323

24-
.bg_splash_localGameManager {
24+
.bg_splash_controller {
2525
background-color: gray;
2626
opacity: 0.5;
2727
width: 100%;

0 commit comments

Comments
 (0)