studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

data cleanup
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
austin 2024-09-12 19:33:12 -04:00
parent b84c5aff49
commit 90793154ed
21 changed files with 88 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
assets/Data/entity/objects.json
View File

@ -1,33 +1,11 @@
{
"objects" : [
{
"id" : "crateWooden",
"modelPath" : "Models/crate2.fbx",
"tokens" : [
"GRAVITY",
"OUTLINE"
],
"collidable": {
"type" : "CUBE",
"dimension1" : 0.1,
"dimension2" : 0.1,
"dimension3" : 0.35,
"rotX": 0,
"rotY": 0,
"rotZ": 0,
"rotW": 1,
"offsetX" : 0,
"offsetY" : 0.05,
"offsetZ" : 0
}
}
],
"files" : [
"Data/entity/objects/floatingisland.json",
"Data/entity/objects/testscene1objects.json",
"Data/entity/objects/debug_objects.json",
"Data/entity/objects/game_objects.json"
"Data/entity/objects/game_objects.json",
"Data/entity/objects/containers.json"
]
}

34
assets/Data/entity/objects/containers.json Normal file
View File

@ -0,0 +1,34 @@
{
"objects" : [
{
"id" : "crate",
"hitboxData" : [
{
"type": "static_capsule",
"radius": 2,
"length": 5
}
],
"collidable": {
"type" : "CUBE",
"dimension1" : 2.0,
"dimension2" : 2.0,
"dimension3" : 2.0,
"rotX": 0,
"rotY": 0,
"rotZ": 0,
"rotW": 1,
"offsetX" : 0,
"offsetY" : 0.05,
"offsetZ" : 0
},
"tokens": [
"GRAVITY"
],
"modelPath" : "Models/objects/crate2.glb"
}
],
"files" : []
}

28
assets/Data/entity/objects/floatingisland.json
View File

@ -1,28 +0,0 @@
{
"objects" : [
{
"id" : "floatingisland1",
"modelPath" : "Models/floatingisland1.fbx",
"tokens" : [
"DISABLE_COLLISION_REACTION",
"TERRAIN_COLLISION"
],
"collidable": {
"type" : "CYLINDER",
"dimension1" : 1.7,
"dimension2" : 1.7,
"dimension3" : 1.7,
"rotX": 0,
"rotY": 0,
"rotZ": 0,
"rotW": 1,
"offsetX" : 0,
"offsetY" : -1.7,
"offsetZ" : 0
}
}
],
"files" : []
}

41
assets/Data/entity/objects/testscene1objects.json
View File

@ -1,46 +1,5 @@
{
"objects" : [
{
"id" : "terrain1",
"modelPath" : "Models/testvalley.fbx",
"tokens" : [
"DISABLE_COLLISION_REACTION",
"GENERATE_COLLISION_TERRAIN"
],
"collidable": null,
"graphicsTemplate": null
},
{
"id" : "skyscraper1",
"modelPath" : "Models/skyscraper1.fbx",
"tokens" : [
"DISABLE_COLLISION_REACTION",
"GENERATE_COLLISION_TERRAIN"
],
"collidable": null,
"graphicsTemplate": null
},
{
"id" : "smoke1",
"modelPath" : "Models/unitcube.fbx",
"tokens" : [
"DRAW_TRANSPARENT_PASS"
],
"collidable": null,
"graphicsTemplate": {
"shaderOverrideMeshList": [
"Cube"
],
"shaderMap": {
"Cube": {
"vertexPath": "Shaders/smoke1/smoke1.vs",
"geometryPath": null,
"fragmentPath": "Shaders/smoke1/smoke1.fs"
}
}
}
},
{
"id" : "geometrytest1",
"modelPath" : "Models/geometry1.fbx",

141
assets/Data/entity/structures.json
View File

@ -1,141 +0,0 @@
{
"structures" : [
{
"name" : "building1",
"modelPath" : "Models/building1.fbx",
"radius" : 10,
"collision" : [
{
"type" : "CUBE",
"positionX" : 0,
"positionY" : -1,
"positionZ" : 0.3,
"scaleX" : 7.5,
"scaleY" : 1.5,
"scaleZ" : 0.3,
"rotationW" : 1,
"rotationX" : 0,
"rotationY" : 0,
"rotationZ" : 0
},
{
"type" : "CUBE",
"positionX" : 7.2,
"positionY" : -1,
"positionZ" : 3,
"scaleX" : 0.3,
"scaleY" : 1.5,
"scaleZ" : 3,
"rotationW" : 1,
"rotationX" : 0,
"rotationY" : 0,
"rotationZ" : 0
},
{
"type" : "CUBE",
"positionX" : 7.2,
"positionY" : 0.4,
"positionZ" : 3,
"scaleX" : 0.3,
"scaleY" : 2,
"scaleZ" : 2,
"rotationW" : 0.9238796,
"rotationX" : 0.3826834,
"rotationY" : 0,
"rotationZ" : 0
},
{
"type" : "CUBE",
"positionX" : -7.2,
"positionY" : -1,
"positionZ" : 3,
"scaleX" : 0.3,
"scaleY" : 1.5,
"scaleZ" : 3,
"rotationW" : 1,
"rotationX" : 0,
"rotationY" : 0,
"rotationZ" : 0
},
{
"type" : "CUBE",
"positionX" : -7.2,
"positionY" : 0.4,
"positionZ" : 3,
"scaleX" : 0.3,
"scaleY" : 2,
"scaleZ" : 2,
"rotationW" : 0.9238796,
"rotationX" : 0.3826834,
"rotationY" : 0,
"rotationZ" : 0
},
{
"type" : "CUBE",
"positionX" : -1.5,
"positionY" : -1,
"positionZ" : 5.7,
"scaleX" : 5.5,
"scaleY" : 1.5,
"scaleZ" : 0.3,
"rotationW" : 1,
"rotationX" : 0,
"rotationY" : 0,
"rotationZ" : 0
},
{
"type" : "CUBE",
"positionX" : 6.75,
"positionY" : -1,
"positionZ" : 5.7,
"scaleX" : 0.75,
"scaleY" : 1.5,
"scaleZ" : 0.3,
"rotationW" : 1,
"rotationX" : 0,
"rotationY" : 0,
"rotationZ" : 0
},
{
"type" : "CUBE",
"positionX" : 0,
"positionY" : -2.6,
"positionZ" : 3,
"scaleX" : 7.5,
"scaleY" : 0.2,
"scaleZ" : 3,
"rotationW" : 1,
"rotationX" : 0,
"rotationY" : 0,
"rotationZ" : 0
},
{
"type" : "CUBE",
"positionX" : 0,
"positionY" : 1.3,
"positionZ" : 4.4,
"scaleX" : 7.5,
"scaleY" : 0.2,
"scaleZ" : 1.8,
"rotationW" : 0.9570922,
"rotationX" : 0.2897836,
"rotationY" : 0,
"rotationZ" : 0
},
{
"type" : "CUBE",
"positionX" : 0,
"positionY" : 1.3,
"positionZ" : 1.6,
"scaleX" : 7.5,
"scaleY" : 0.2,
"scaleZ" : 1.8,
"rotationW" : 0.9570922,
"rotationX" : -0.2897836,
"rotationY" : 0,
"rotationZ" : 0
}
]
}
]
}

BIN
assets/Models/basic/geometry/unitcylinder.fbx
View File

Binary file not shown.

BIN
assets/Models/basic/geometry/unitcylinder.glb
View File

Binary file not shown.

BIN
assets/Models/basic/geometry/unitsphere.fbx
View File

Binary file not shown.

BIN
assets/Models/basic/geometry/unitsphere.glb
View File

Binary file not shown.

BIN
assets/Models/basic/geometry/unitsphere_1.fbx
View File

Binary file not shown.

BIN
assets/Models/basic/geometry/unitsphere_grey.fbx
View File

Binary file not shown.

BIN
assets/Models/basic/geometry/watercube1.fbx
View File

Binary file not shown.

BIN
assets/Models/buildings/building1.fbx
View File

Binary file not shown.

BIN
assets/Models/engine/groundplanemassiveuv.fbx
View File

Binary file not shown.

BIN
assets/Models/objects/campfire1.fbx
View File

Binary file not shown.

BIN
assets/Models/objects/crate2.fbx
View File

Binary file not shown.

BIN
assets/Models/objects/crate2.glb Normal file
View File

Binary file not shown.

BIN
assets/Models/objects/flame1.fbx
View File

Binary file not shown.

11
assets/Models/objects/texturemap.json Normal file
View File

@ -0,0 +1,11 @@
{
"textureMap": {
"Models/objects/crate2.glb": [
{
"meshName" : "Cube",
"diffuse" : "/Textures/woodplanks1.png",
"isDefault" : true
}
]
}
}

2
docs/src/progress/renderertodo.md
View File

@ -742,6 +742,8 @@ Fix SSBO implementation misusing BufferUtils
Massive entity spawning refactor to collapse entity type permutations
Move AttachUtils package
Move Scene package
Crate object
Data cleanup
# TODO

76
src/main/java/electrosphere/server/content/serialization/ContentSerialization.java
View File

@ -39,43 +39,45 @@ public class ContentSerialization {
for(Entity entity : entities){
if(!CreatureUtils.hasControllerPlayerId(entity)){
EntityType type = CommonEntityUtils.getEntityType(entity);
switch(type){
case CREATURE: {
EntitySerialization serializedEntity = new EntitySerialization();
serializedEntity.setPosition(EntityUtils.getPosition(entity));
serializedEntity.setRotation(EntityUtils.getRotation(entity));
serializedEntity.setType(EntityType.CREATURE.getValue());
serializedEntity.setSubtype(CommonEntityUtils.getEntitySubtype(entity));
if(CreatureUtils.getCreatureTemplate(entity) != null){
serializedEntity.setTemplate(Utilities.stringify(CreatureUtils.getCreatureTemplate(entity)));
}
rVal.serializedEntities.add(serializedEntity);
} break;
case ITEM: {
EntitySerialization serializedEntity = new EntitySerialization();
serializedEntity.setPosition(EntityUtils.getPosition(entity));
serializedEntity.setRotation(EntityUtils.getRotation(entity));
serializedEntity.setType(EntityType.ITEM.getValue());
serializedEntity.setSubtype(CommonEntityUtils.getEntitySubtype(entity));
rVal.serializedEntities.add(serializedEntity);
} break;
case FOLIAGE: {
EntitySerialization serializedEntity = new EntitySerialization();
serializedEntity.setPosition(EntityUtils.getPosition(entity));
serializedEntity.setRotation(EntityUtils.getRotation(entity));
serializedEntity.setType(EntityType.FOLIAGE.getValue());
serializedEntity.setSubtype(CommonEntityUtils.getEntitySubtype(entity));
serializedEntity.setTemplate(FoliageUtils.getFoliageSeed(entity) + "");
rVal.serializedEntities.add(serializedEntity);
} break;
case COMMON: {
EntitySerialization serializedEntity = new EntitySerialization();
serializedEntity.setPosition(EntityUtils.getPosition(entity));
serializedEntity.setRotation(EntityUtils.getRotation(entity));
serializedEntity.setType(EntityType.COMMON.getValue());
serializedEntity.setSubtype(CommonEntityUtils.getEntitySubtype(entity));
rVal.serializedEntities.add(serializedEntity);
} break;
if(type != null){
switch(type){
case CREATURE: {
EntitySerialization serializedEntity = new EntitySerialization();
serializedEntity.setPosition(EntityUtils.getPosition(entity));
serializedEntity.setRotation(EntityUtils.getRotation(entity));
serializedEntity.setType(EntityType.CREATURE.getValue());
serializedEntity.setSubtype(CommonEntityUtils.getEntitySubtype(entity));
if(CreatureUtils.getCreatureTemplate(entity) != null){
serializedEntity.setTemplate(Utilities.stringify(CreatureUtils.getCreatureTemplate(entity)));
}
rVal.serializedEntities.add(serializedEntity);
} break;
case ITEM: {
EntitySerialization serializedEntity = new EntitySerialization();
serializedEntity.setPosition(EntityUtils.getPosition(entity));
serializedEntity.setRotation(EntityUtils.getRotation(entity));
serializedEntity.setType(EntityType.ITEM.getValue());
serializedEntity.setSubtype(CommonEntityUtils.getEntitySubtype(entity));
rVal.serializedEntities.add(serializedEntity);
} break;
case FOLIAGE: {
EntitySerialization serializedEntity = new EntitySerialization();
serializedEntity.setPosition(EntityUtils.getPosition(entity));
serializedEntity.setRotation(EntityUtils.getRotation(entity));
serializedEntity.setType(EntityType.FOLIAGE.getValue());
serializedEntity.setSubtype(CommonEntityUtils.getEntitySubtype(entity));
serializedEntity.setTemplate(FoliageUtils.getFoliageSeed(entity) + "");
rVal.serializedEntities.add(serializedEntity);
} break;
case COMMON: {
EntitySerialization serializedEntity = new EntitySerialization();
serializedEntity.setPosition(EntityUtils.getPosition(entity));
serializedEntity.setRotation(EntityUtils.getRotation(entity));
serializedEntity.setType(EntityType.COMMON.getValue());
serializedEntity.setSubtype(CommonEntityUtils.getEntitySubtype(entity));
rVal.serializedEntities.add(serializedEntity);
} break;
}
}
}
}