Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update by dinomut1 at 2024-01-30T07:48:27.583Z #2

Merged
merged 2 commits into from
Jan 30, 2024
Merged

Update by dinomut1 at 2024-01-30T07:48:27.583Z #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b59bbd4
Update by dinomut1 at 2024-01-30T07:48:27.583Z
dinomut1 Jan 30, 2024
bd1e213
Merge branch 'main' into dev-deployment
dinomut1 Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
assets/Flying[[:space:]]pterodactyl.glb filter=lfs diff=lfs merge=lfs -text
assets/Rock[[:space:]]fountain.glb filter=lfs diff=lfs merge=lfs -text
assets/cherry_blossom_tree_01.glb filter=lfs diff=lfs merge=lfs -text
assets/cherry_blossom_tree_02.glb filter=lfs diff=lfs merge=lfs -text
assets/city1.glb filter=lfs diff=lfs merge=lfs -text
assets/concrete_cat_statue_4k.glb filter=lfs diff=lfs merge=lfs -text
assets/halloweenMaple.glb filter=lfs diff=lfs merge=lfs -text
Expand Down
0 New-Scene-2.envmap.ktx2 → New-Scene-1.envmap.ktx2
View file
Open in desktop
File renamed without changes.
0 New-Scene-2.scene.json → New-Scene-1.scene.json
View file
Open in desktop
File renamed without changes.
0 New-Scene-2.thumbnail.ktx2 → New-Scene-1.thumbnail.ktx2
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion New-Scene-4.scene.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added New-Scene-5.envmap.ktx2
View file
Open in desktop
Binary file not shown.
324 changes: 324 additions & 0 deletions New-Scene-5.scene.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,324 @@
{
"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": "__$project$__/default-project/default.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": 8311585,
"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.24690793740359293,
"y": 0.28965548016032816,
"z": 0.07761295437009141,
"w": 0.9214729527089438
},
"scale": {
"x": 1,
"y": 1,
"z": 1
}
}
},
{
"name": "visible",
"props": {}
},
{
"name": "directional-light",
"props": {
"color": 16777215,
"intensity": 1,
"cameraFar": 2000,
"castShadow": true,
"shadowMapResolution": 512,
"shadowBias": -0.00001,
"shadowRadius": 1,
"useInCSM": true
}
}
],
"parent": "d32b1c4e-d08e-4fb0-9107-4c88a281ee71",
"index": 5,
"name": "directional light"
}
},
"root": "d32b1c4e-d08e-4fb0-9107-4c88a281ee71"
}
Binary file added New-Scene-5.thumbnail.ktx2
View file
Open in desktop
Binary file not shown.
4 changes: 1 addition & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
### Ethereal Engine Project

This is an Ethereal Engine project.
# ee-ar-demos
Binary file added UVOL test.envmap.ktx2
View file
Open in desktop
Binary file not shown.
Loading