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

fix(build): Update schema, esp. removing unsupported items from: text, thickline #482

Merged
merged 9 commits into from
Aug 3, 2022
+198 −294
Merged

fix(build): Update schema, esp. removing unsupported items from: text, thickline #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ee26baa
separate transform, update text/thickline
mwfarb Jul 26, 2022
425119a
entity rename
mwfarb Jul 29, 2022
ca0793d
add videosphere
mwfarb Jul 30, 2022
399de1d
add prism primitive
mwfarb Jul 30, 2022
3f11327
videosphere rough load
mwfarb Aug 1, 2022
0127421
fix jitsi-video displayname, fix videosphere maps
mwfarb Aug 2, 2022
6656327
Merge branch 'master' into schema-update
mwfarb Aug 2, 2022
2c21095
chore: default videosphere radius
mwfarb Aug 3, 2022
d31d700
restore pano video size
mwfarb Aug 3, 2022
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
5 changes: 4 additions & 1 deletion build/schemas/box.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
}
}
},
{
"$ref": "./schemas/definitions-entity.json#/properties"
},
{
"$ref": "./schemas/definitions-common.json#/properties"
},
Expand Down Expand Up @@ -96,4 +99,4 @@
"data",
"persist"
]
}
}
5 changes: 4 additions & 1 deletion build/schemas/circle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
}
}
},
{
"$ref": "./schemas/definitions-entity.json#/properties"
},
{
"$ref": "./schemas/definitions-common.json#/properties"
},
Expand Down Expand Up @@ -82,4 +85,4 @@
"data",
"persist"
]
}
}
5 changes: 4 additions & 1 deletion build/schemas/cone.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@
}
}
},
{
"$ref": "./schemas/definitions-entity.json#/properties"
},
{
"$ref": "./schemas/definitions-common.json#/properties"
},
Expand Down Expand Up @@ -104,4 +107,4 @@
"data",
"persist"
]
}
}
5 changes: 4 additions & 1 deletion build/schemas/cube.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
}
}
},
{
"$ref": "./schemas/definitions-entity.json#/properties"
},
{
"$ref": "./schemas/definitions-common.json#/properties"
},
Expand All @@ -77,4 +80,4 @@
"data",
"persist"
]
}
}
5 changes: 4 additions & 1 deletion build/schemas/cylinder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
}
}
},
{
"$ref": "./schemas/definitions-entity.json#/properties"
},
{
"$ref": "./schemas/definitions-common.json#/properties"
},
Expand Down Expand Up @@ -99,4 +102,4 @@
"data",
"persist"
]
}
}
83 changes: 1 addition & 82 deletions build/schemas/definitions-common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
"landmark":{
"title":"Landmark",
"type":"object",
"description":"Define entities as a landmark; Landmarks appears in the landmark list and you can move (teleport) to them; You can define the behavior of the teleport: if you will be at a fixed or random distance, looking at the landmark, fixed offset or if it is contrained by a navmesh (when it exists)",
"description":"Define entities as a landmark; Landmarks appears in the landmark list and you can move (teleport) to them; You can define the behavior of the teleport: if you will be at a fixed or random distance, looking at the landmark, fixed offset or if it is constrained by a navmesh (when it exists)",
"properties":{
"randomRadiusMin":{
"default":0,
Expand Down Expand Up @@ -420,87 +420,6 @@
"title":"Material extras",
"type":"object"
},
"parent":{
"description":"Parent's object_id. Child objects inherit attributes of their parent, for example scale and translation.",
"title":"Parent",
"type":"string"
},
"position":{
"description":"3D object position",
"properties":{
"x":{
"type":"number"
},
"y":{
"type":"number"
},
"z":{
"type":"number"
}
},
"required":[
"x",
"y",
"z"
],
"type":"object",
"title":"Position"
},
"rotation":{
"description":"3D object rotation in degrees by default; Right-handed coordinate system. Switches to quaternion representation if 'w' is given",
"properties":{
"w":{
"default":1,
"type":"number"
},
"x":{
"default":0,
"type":"number"
},
"y":{
"default":0,
"type":"number"
},
"z":{
"default":0,
"type":"number"
}
},
"required":[
"x",
"y",
"z"
],
"type":"object",
"title":"Rotation"
},
"scale":{
"default":{
"x":1,
"y":1,
"z":1
},
"description":"3D object scale",
"id":"scale",
"properties":{
"x":{
"type":"number"
},
"y":{
"type":"number"
},
"z":{
"type":"number"
}
},
"required":[
"x",
"y",
"z"
],
"type":"object",
"title":"Scale"
},
"shadow":{
"title":"Shadow",
"type":"object",
Expand Down
90 changes: 90 additions & 0 deletions build/schemas/definitions-entity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"properties":{
"parent":{
"description":"Parent's object_id. Child objects inherit attributes of their parent, for example scale and translation.",
"title":"Parent",
"type":"string"
},
"position":{
"description":"3D object position",
"properties":{
"x":{
"type":"number"
},
"y":{
"type":"number"
},
"z":{
"type":"number"
}
},
"required":[
"x",
"y",
"z"
],
"type":"object",
"title":"Position"
},
"rotation":{
"description":"3D object rotation in degrees by default; Right-handed coordinate system. Switches to quaternion representation if 'w' is given",
"properties":{
"w":{
"default":1,
"type":"number"
},
"x":{
"default":0,
"type":"number"
},
"y":{
"default":0,
"type":"number"
},
"z":{
"default":0,
"type":"number"
}
},
"required":[
"x",
"y",
"z"
],
"type":"object",
"title":"Rotation"
},
"scale":{
"default":{
"x":1,
"y":1,
"z":1
},
"description":"3D object scale",
"id":"scale",
"properties":{
"x":{
"type":"number"
},
"y":{
"type":"number"
},
"z":{
"type":"number"
}
},
"required":[
"x",
"y",
"z"
],
"type":"object",
"title":"Scale"
}
},
"required": [
"object_type",
"position",
"rotation"
]
}
Loading