Skip to content

Commit 81f7192

Browse files
committed
Merge branch 'dev-deployment'
2 parents 80cd990 + 199e8c5 commit 81f7192

File tree

98 files changed

+45799
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+45799
-23
lines changed

.gitattributes

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
assets/Flying[[:space:]]pterodactyl.glb filter=lfs diff=lfs merge=lfs -text
2+
assets/Rock[[:space:]]fountain.glb filter=lfs diff=lfs merge=lfs -text
3+
assets/city1.glb filter=lfs diff=lfs merge=lfs -text
4+
assets/concrete_cat_statue_4k.glb filter=lfs diff=lfs merge=lfs -text
5+
assets/halloweenMaple.glb filter=lfs diff=lfs merge=lfs -text
6+
assets/island_tree_01.glb filter=lfs diff=lfs merge=lfs -text
7+
assets/mossy_logo.glb filter=lfs diff=lfs merge=lfs -text
8+
assets/plinth_02.glb filter=lfs diff=lfs merge=lfs -text
9+
assets/rock_moss_set_02_4k_01.glb filter=lfs diff=lfs merge=lfs -text
10+
assets/rock_moss_set_02_4k_02.glb filter=lfs diff=lfs merge=lfs -text
11+
assets/rock_moss_set_02_4k_07.glb filter=lfs diff=lfs merge=lfs -text
12+
assets/trex_pond_rocks_04_atlased_Trex_Normal.png filter=lfs diff=lfs merge=lfs -text

LICENSE

Lines changed: 0 additions & 22 deletions
This file was deleted.

New-Scene-2.envmap.ktx2

2.03 MB
Binary file not shown.

New-Scene-2.scene.json

Lines changed: 324 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,324 @@
1+
{
2+
"version": 0,
3+
"entities": {
4+
"d32b1c4e-d08e-4fb0-9107-4c88a281ee71": {
5+
"components": [
6+
{
7+
"name": "visible",
8+
"props": {}
9+
},
10+
{
11+
"name": "transform",
12+
"props": {
13+
"position": {
14+
"x": 0,
15+
"y": 0,
16+
"z": 0
17+
},
18+
"rotation": {
19+
"x": 0,
20+
"y": 0,
21+
"z": 0,
22+
"w": 1
23+
},
24+
"scale": {
25+
"x": 1,
26+
"y": 1,
27+
"z": 1
28+
}
29+
}
30+
},
31+
{
32+
"name": "envmapbake",
33+
"props": {
34+
"bakePosition": {
35+
"x": 0,
36+
"y": 0,
37+
"z": 0
38+
},
39+
"bakePositionOffset": {
40+
"x": 0,
41+
"y": 0,
42+
"z": 0
43+
},
44+
"bakeScale": {
45+
"x": 1,
46+
"y": 1,
47+
"z": 1
48+
},
49+
"bakeType": "Baked",
50+
"resolution": 2048,
51+
"refreshMode": "OnAwake",
52+
"envMapOrigin": "__$project$__/default-project/default.envmap.ktx2",
53+
"boxProjection": true
54+
}
55+
},
56+
{
57+
"name": "fog",
58+
"props": {
59+
"type": "linear",
60+
"color": "#FFFFFF",
61+
"density": 0.005,
62+
"near": 1,
63+
"far": 1000,
64+
"timeScale": 1,
65+
"height": 0.05
66+
}
67+
}
68+
],
69+
"name": "default"
70+
},
71+
"bb362197-f14d-4da7-9c3c-1ed834386423": {
72+
"components": [
73+
{
74+
"name": "transform",
75+
"props": {
76+
"position": {
77+
"x": 0,
78+
"y": 2.5,
79+
"z": 5
80+
},
81+
"rotation": {
82+
"x": 0,
83+
"y": 0,
84+
"z": 0,
85+
"w": 1
86+
},
87+
"scale": {
88+
"x": 1,
89+
"y": 1,
90+
"z": 1
91+
}
92+
}
93+
},
94+
{
95+
"name": "scene-preview-camera",
96+
"props": {}
97+
}
98+
],
99+
"parent": "d32b1c4e-d08e-4fb0-9107-4c88a281ee71",
100+
"index": 0,
101+
"name": "scene preview camera"
102+
},
103+
"e7d6bfb1-6390-4a8b-b744-da83b059c2d3": {
104+
"components": [
105+
{
106+
"name": "transform",
107+
"props": {
108+
"position": {
109+
"x": 0,
110+
"y": 0,
111+
"z": 0
112+
},
113+
"rotation": {
114+
"x": 0,
115+
"y": 0,
116+
"z": 0,
117+
"w": 1
118+
},
119+
"scale": {
120+
"x": 1,
121+
"y": 1,
122+
"z": 1
123+
}
124+
}
125+
},
126+
{
127+
"name": "visible",
128+
"props": {}
129+
},
130+
{
131+
"name": "skybox",
132+
"props": {
133+
"backgroundColor": 0,
134+
"equirectangularPath": "",
135+
"cubemapPath": "__$project$__/default-project/assets/skyboxsun25deg/",
136+
"backgroundType": 1,
137+
"skyboxProps": {
138+
"turbidity": 10,
139+
"rayleigh": 1,
140+
"luminance": 1,
141+
"mieCoefficient": 0.004999999999999893,
142+
"mieDirectionalG": 0.99,
143+
"inclination": 0.10471975511965978,
144+
"azimuth": 0.16666666666666666
145+
}
146+
}
147+
}
148+
],
149+
"parent": "d32b1c4e-d08e-4fb0-9107-4c88a281ee71",
150+
"index": 1,
151+
"name": "skybox"
152+
},
153+
"38793f94-0b92-4ea1-af7b-5ec0e117628d": {
154+
"components": [
155+
{
156+
"name": "transform",
157+
"props": {
158+
"position": {
159+
"x": 0,
160+
"y": 0,
161+
"z": 0
162+
},
163+
"rotation": {
164+
"x": 0,
165+
"y": 0,
166+
"z": 0,
167+
"w": 1
168+
},
169+
"scale": {
170+
"x": 1,
171+
"y": 1,
172+
"z": 1
173+
}
174+
}
175+
},
176+
{
177+
"name": "visible",
178+
"props": {}
179+
},
180+
{
181+
"name": "ground-plane",
182+
"props": {
183+
"color": 8311585,
184+
"visible": true
185+
}
186+
},
187+
{
188+
"name": "shadow",
189+
"props": {
190+
"cast": false,
191+
"receive": true
192+
}
193+
}
194+
],
195+
"parent": "d32b1c4e-d08e-4fb0-9107-4c88a281ee71",
196+
"index": 2,
197+
"name": "ground plane"
198+
},
199+
"3e8a430e-9dcf-440e-990c-44ecb8051762": {
200+
"components": [
201+
{
202+
"name": "transform",
203+
"props": {
204+
"position": {
205+
"x": 0,
206+
"y": 0,
207+
"z": 0
208+
},
209+
"rotation": {
210+
"x": -5.053215498074303e-16,
211+
"y": -1,
212+
"z": -6.12323399573677e-17,
213+
"w": -6.123234262925839e-17
214+
},
215+
"scale": {
216+
"x": 1,
217+
"y": 1,
218+
"z": 1
219+
}
220+
}
221+
},
222+
{
223+
"name": "visible",
224+
"props": {}
225+
},
226+
{
227+
"name": "spawn-point",
228+
"props": {
229+
"permissionedUsers": []
230+
}
231+
}
232+
],
233+
"parent": "d32b1c4e-d08e-4fb0-9107-4c88a281ee71",
234+
"index": 3,
235+
"name": "spawn point"
236+
},
237+
"f77dc4c6-c9a6-433d-8102-4a9a8e1c0ce9": {
238+
"components": [
239+
{
240+
"name": "transform",
241+
"props": {
242+
"position": {
243+
"x": 0,
244+
"y": 0,
245+
"z": 0
246+
},
247+
"rotation": {
248+
"x": 0,
249+
"y": 0,
250+
"z": 0,
251+
"w": 1
252+
},
253+
"scale": {
254+
"x": 1,
255+
"y": 1,
256+
"z": 1
257+
}
258+
}
259+
},
260+
{
261+
"name": "visible",
262+
"props": {}
263+
},
264+
{
265+
"name": "hemisphere-light",
266+
"props": {
267+
"skyColor": 16777215,
268+
"groundColor": 16777215,
269+
"intensity": 1
270+
}
271+
}
272+
],
273+
"parent": "d32b1c4e-d08e-4fb0-9107-4c88a281ee71",
274+
"index": 4,
275+
"name": "hemisphere light"
276+
},
277+
"cb045cfd-8daf-4a2b-b764-35625be54a11": {
278+
"components": [
279+
{
280+
"name": "transform",
281+
"props": {
282+
"position": {
283+
"x": 0,
284+
"y": 10,
285+
"z": 0
286+
},
287+
"rotation": {
288+
"x": 0.24690793740359293,
289+
"y": 0.28965548016032816,
290+
"z": 0.07761295437009141,
291+
"w": 0.9214729527089438
292+
},
293+
"scale": {
294+
"x": 1,
295+
"y": 1,
296+
"z": 1
297+
}
298+
}
299+
},
300+
{
301+
"name": "visible",
302+
"props": {}
303+
},
304+
{
305+
"name": "directional-light",
306+
"props": {
307+
"color": 16777215,
308+
"intensity": 1,
309+
"cameraFar": 2000,
310+
"castShadow": true,
311+
"shadowMapResolution": 512,
312+
"shadowBias": -0.00001,
313+
"shadowRadius": 1,
314+
"useInCSM": true
315+
}
316+
}
317+
],
318+
"parent": "d32b1c4e-d08e-4fb0-9107-4c88a281ee71",
319+
"index": 5,
320+
"name": "directional light"
321+
}
322+
},
323+
"root": "d32b1c4e-d08e-4fb0-9107-4c88a281ee71"
324+
}

New-Scene-2.thumbnail.ktx2

5.86 KB
Binary file not shown.

New-Scene-4.envmap.ktx2

1.44 MB
Binary file not shown.

New-Scene-4.scene.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":0,"entities":{"d32b1c4e-d08e-4fb0-9107-4c88a281ee71":{"components":[{"name":"visible","props":{}},{"name":"transform","props":{"position":{"x":0,"y":0,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1}}},{"name":"envmapbake","props":{"bakePosition":{"x":0,"y":0,"z":0},"bakePositionOffset":{"x":0,"y":0,"z":0},"bakeScale":{"x":1,"y":1,"z":1},"bakeType":"Baked","resolution":2048,"refreshMode":"OnAwake","envMapOrigin":"https://resources-dev.etherealengine.com/projects/ee-ar-demos/New-Scene-4.envmap.ktx2","boxProjection":true}},{"name":"fog","props":{"type":"linear","color":"#FFFFFF","density":0.005,"near":1,"far":1000,"timeScale":1,"height":0.05}}],"name":"default"},"bb362197-f14d-4da7-9c3c-1ed834386423":{"components":[{"name":"transform","props":{"position":{"x":0,"y":2.5,"z":5},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1}}},{"name":"scene-preview-camera","props":{}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":0,"name":"scene preview camera"},"e7d6bfb1-6390-4a8b-b744-da83b059c2d3":{"components":[{"name":"transform","props":{"position":{"x":0,"y":0,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1}}},{"name":"visible","props":{}},{"name":"skybox","props":{"backgroundColor":0,"equirectangularPath":"","cubemapPath":"__$project$__/default-project/assets/skyboxsun25deg/","backgroundType":1,"skyboxProps":{"turbidity":10,"rayleigh":1,"luminance":1,"mieCoefficient":0.004999999999999893,"mieDirectionalG":0.99,"inclination":0.10471975511965978,"azimuth":0.16666666666666666}}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":1,"name":"skybox"},"38793f94-0b92-4ea1-af7b-5ec0e117628d":{"components":[{"name":"transform","props":{"position":{"x":0,"y":0,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1}}},{"name":"visible","props":{}},{"name":"ground-plane","props":{"color":9682529,"visible":true}},{"name":"shadow","props":{"cast":false,"receive":true}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":2,"name":"ground plane"},"3e8a430e-9dcf-440e-990c-44ecb8051762":{"components":[{"name":"transform","props":{"position":{"x":0,"y":0,"z":0},"rotation":{"x":5.053215498074303e-16,"y":1,"z":6.12323399573677e-17,"w":6.123234262925839e-17},"scale":{"x":1,"y":1,"z":1}}},{"name":"visible","props":{}},{"name":"spawn-point","props":{"permissionedUsers":[]}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":3,"name":"spawn point"},"f77dc4c6-c9a6-433d-8102-4a9a8e1c0ce9":{"components":[{"name":"transform","props":{"position":{"x":0,"y":0,"z":0},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1,"y":1,"z":1}}},{"name":"visible","props":{}},{"name":"hemisphere-light","props":{"skyColor":16777215,"groundColor":16777215,"intensity":1}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":4,"name":"hemisphere light"},"cb045cfd-8daf-4a2b-b764-35625be54a11":{"components":[{"name":"transform","props":{"position":{"x":0,"y":10,"z":0},"rotation":{"x":0.246907937403593,"y":0.28965548016032816,"z":0.07761295437009143,"w":0.9214729527089437},"scale":{"x":1,"y":1,"z":0.9999999999999999}}},{"name":"visible","props":{}},{"name":"directional-light","props":{"color":16777215,"intensity":1,"cameraFar":2000,"castShadow":true,"shadowBias":-0.00001,"shadowRadius":1,"useInCSM":true}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":5,"name":"directional light"},"c0d19993-ca20-49e7-9a32-9d5950557c16":{"components":[{"name":"gltf-model","props":{"src":"https://resources-dev.etherealengine.com/static-resources/ee-ar-demos/rock_moss_set_02_4k_01.glb","generateBVH":true,"avoidCameraOcclusion":true}},{"name":"loop-animation","props":{"hasAvatarAnimations":false,"activeClipIndex":-1,"animationPack":"","paused":false,"time":0,"timeScale":1,"blendMode":2500,"loop":2201,"clampWhenFinished":false,"zeroSlopeAtStart":true,"zeroSlopeAtEnd":true,"weight":1}},{"name":"visible","props":{}},{"name":"transform","props":{"position":{"x":-2.4735337680298937,"y":-1.2041172330538694,"z":-5.846783295829577},"rotation":{"x":0.2660652378329504,"y":-0.16190464079170253,"z":0.039703058073496514,"w":0.9494313264721246},"scale":{"x":1.90684651317762,"y":1.9068465131776187,"z":1.9068465131776182}}},{"name":"shadow","props":{"cast":true,"receive":true}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":6,"name":"rock-01"},"b3c4c073-8e63-4cb0-9e07-480cc1006fdd":{"components":[{"name":"gltf-model","props":{"src":"https://resources-dev.etherealengine.com/static-resources/ee-ar-demos/rock_moss_set_02_4k_02.glb","generateBVH":true,"avoidCameraOcclusion":true}},{"name":"loop-animation","props":{"hasAvatarAnimations":false,"activeClipIndex":-1,"animationPack":"","paused":false,"time":0,"timeScale":1,"blendMode":2500,"loop":2201,"clampWhenFinished":false,"zeroSlopeAtStart":true,"zeroSlopeAtEnd":true,"weight":1}},{"name":"visible","props":{}},{"name":"transform","props":{"position":{"x":-3.7765864714459685,"y":-0.15021525711505723,"z":-5.802746095699078},"rotation":{"x":-0.0300113764332158,"y":0.10908672695347661,"z":0.0728439779630364,"w":0.9909052215836195},"scale":{"x":1.3030858127960967,"y":0.9333912896167874,"z":0.9999999999999978}}},{"name":"shadow","props":{"cast":true,"receive":true}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":7,"name":"rock-02"},"58c53563-3206-49ef-ac43-9e1a1b158678":{"components":[{"name":"gltf-model","props":{"src":"https://resources-dev.etherealengine.com/static-resources/ee-ar-demos/rock_moss_set_02_4k_02.glb","generateBVH":true,"avoidCameraOcclusion":true}},{"name":"loop-animation","props":{"hasAvatarAnimations":false,"activeClipIndex":-1,"animationPack":"","paused":false,"time":0,"timeScale":1,"blendMode":2500,"loop":2201,"clampWhenFinished":false,"zeroSlopeAtStart":true,"zeroSlopeAtEnd":true,"weight":1}},{"name":"visible","props":{}},{"name":"transform","props":{"position":{"x":-4.003338818451277,"y":-0.2988541893461746,"z":-8.212168369637164},"rotation":{"x":0.3985020185162639,"y":0.05846062733563623,"z":-0.6426482064655499,"w":0.651752851176425},"scale":{"x":1.672585877381509,"y":1.2202678263415472,"z":0.9287419340441805}}},{"name":"shadow","props":{"cast":true,"receive":true}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":8,"name":"rock-02"},"4bf812a4-7a3f-4d75-98c7-341d1a5aa765":{"components":[{"name":"gltf-model","props":{"src":"https://resources-dev.etherealengine.com/static-resources/ee-ar-demos/island_tree_01.glb","generateBVH":true,"avoidCameraOcclusion":true}},{"name":"loop-animation","props":{"hasAvatarAnimations":false,"activeClipIndex":-1,"animationPack":"","paused":false,"time":0,"timeScale":1,"blendMode":2500,"loop":2201,"clampWhenFinished":false,"zeroSlopeAtStart":true,"zeroSlopeAtEnd":true,"weight":1}},{"name":"visible","props":{}},{"name":"transform","props":{"position":{"x":-5.728948630698634,"y":0.028194152621562368,"z":-6.419847243351335},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":1.6174068856669996,"y":1.6174068856669996,"z":1.6174068856669996}}},{"name":"shadow","props":{"cast":true,"receive":true}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":9,"name":"tree"},"4fe6d8a6-7ff2-4829-9566-82e454dc7be7":{"components":[{"name":"gltf-model","props":{"src":"https://resources-dev.etherealengine.com/static-resources/ee-ar-demos/concrete_cat_statue_4k.glb","generateBVH":true,"avoidCameraOcclusion":true}},{"name":"loop-animation","props":{"hasAvatarAnimations":false,"activeClipIndex":-1,"animationPack":"","paused":false,"time":0,"timeScale":1,"blendMode":2500,"loop":2201,"clampWhenFinished":false,"zeroSlopeAtStart":true,"zeroSlopeAtEnd":true,"weight":1}},{"name":"visible","props":{}},{"name":"transform","props":{"position":{"x":-4.084363605170049,"y":0.38718530298258536,"z":-6.679538440456234},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":3.6,"y":3.6,"z":3.6}}},{"name":"shadow","props":{"cast":true,"receive":true}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":10,"name":"cat statue"},"65e4507b-3fb3-457a-bbe7-b29f472011c1":{"components":[{"name":"gltf-model","props":{"src":"https://resources-dev.etherealengine.com/static-resources/ee-ar-demos/Flying%20hummingbird.glb","generateBVH":false,"avoidCameraOcclusion":true}},{"name":"loop-animation","props":{"hasAvatarAnimations":false,"activeClipIndex":1,"animationPack":"","paused":false,"time":0.25292769302521734,"timeScale":1,"blendMode":2500,"loop":2201,"clampWhenFinished":false,"zeroSlopeAtStart":true,"zeroSlopeAtEnd":true,"weight":1}},{"name":"visible","props":{}},{"name":"transform","props":{"position":{"x":-3.426897156647258,"y":0.9791764557063014,"z":-6.998984135745371},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":2.5130316133649093,"y":2.5130316133649093,"z":2.5130316133649093}}},{"name":"shadow","props":{"cast":true,"receive":true}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":11,"name":"hummingbird"},"a2e5218c-d6c6-45b1-89f6-5f3837179d12":{"components":[{"name":"gltf-model","props":{"src":"https://resources-dev.etherealengine.com/static-resources/ee-ar-demos/Flying%20hummingbird.glb","generateBVH":false,"avoidCameraOcclusion":true}},{"name":"loop-animation","props":{"hasAvatarAnimations":false,"activeClipIndex":1,"animationPack":"","paused":false,"time":8.064042298829563,"timeScale":1,"blendMode":2500,"loop":2201,"clampWhenFinished":false,"zeroSlopeAtStart":true,"zeroSlopeAtEnd":true,"weight":1}},{"name":"visible","props":{}},{"name":"transform","props":{"position":{"x":-2.7089275410975935,"y":2.042977283143857,"z":-8.200984558715266},"rotation":{"x":0,"y":0,"z":0,"w":1},"scale":{"x":2.5130316133649093,"y":2.5130316133649093,"z":2.5130316133649093}}},{"name":"shadow","props":{"cast":true,"receive":true}}],"parent":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71","index":12,"name":"hummingbird"}},"root":"d32b1c4e-d08e-4fb0-9107-4c88a281ee71"}

New-Scene-4.thumbnail.ktx2

80.8 KB
Binary file not shown.

New-Scene.envmap.ktx2

2.03 MB
Binary file not shown.

0 commit comments

Comments
 (0)