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

slightly better assets

Browse Source
This commit is contained in:
austin 2022-05-08 23:37:42 -04:00
parent 12900a9b26
commit 12aeb0a317
10 changed files with 30 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/Data/creatures/elf.json
View File

@ -135,7 +135,7 @@
"maxVelocity" : 5.8,
"staminaMax" : 500,
"animationStartUp" : {
"name" : "SprintStart",
"name" : "Sprint",
"length" : 1,
"loops" : false
},

17
assets/Data/creatures/human.json
View File

@ -109,6 +109,19 @@
"primaryBone" : "Head",
"minValue" : 0.8,
"maxValue" : 1.2
},
{
"attributeId" : "hair",
"type" : "remesh",
"variants" : [
{
"id" : "hairshort1",
"model" : "Models/hairshort1meshed.fbx",
"meshes" : [
"Hair"
]
}
]
}
],
"movementSystems" : [
@ -132,10 +145,10 @@
"loops" : false
},
"sprintSystem" : {
"maxVelocity" : 5.8,
"maxVelocity" : 0.058,
"staminaMax" : 500,
"animationStartUp" : {
"name" : "SprintStart",
"name" : "Sprint",
"length" : 1,
"loops" : false
},

179
assets/Data/creatures/human2.json
View File

@ -1,179 +0,0 @@
{
"creatures" : [
{
"creatureId" : "human",
"hitboxes" : [
{
"type": "hurt",
"bone": "Bone.031",
"radius": 0.04
},
{
"type": "hurt",
"bone": "Bone.012",
"radius": 0.04
},
{
"type": "hurt",
"bone": "Bone.003",
"radius": 0.04
},
{
"type": "hurt",
"bone": "Bone.010",
"radius": 0.06
},
{
"type": "hurt",
"bone": "Bone.001",
"radius": 0.06
},
{
"type": "hurt",
"bone": "Bone.014",
"radius": 0.06
},
{
"type": "hurt",
"bone": "Bone",
"radius": 0.08
},
{
"type": "hurt",
"bone": "Bone.014",
"radius": 0.06
},
{
"type": "hurt",
"bone": "Bone.019",
"radius": 0.04
}
],
"tokens" : [
"BLENDER_TRANSFORM",
"SENTIENT",
"ATTACKER",
"GRAVITY",
"TARGETABLE",
"CAN_EQUIP"
],
"visualAttributes" : [
{
"attributeId" : "hair",
"variants" : [
{
"id" : "hairshort1",
"model" : "Models/hairshort1.fbx",
"meshes" : [
"Hair"
]
}
]
}
],
"movementSystems" : [
{
"type" : "GROUND",
"acceleration" : 1000.0,
"maxVelocity" : 1.0,
"animationStartup" : {
"name" : "Armature|Walk",
"length" : 1,
"loops" : false
},
"animationLoop" : {
"name" : "Armature|Walk",
"length" : 1,
"loops" : false
},
"animationWindDown" : {
"name" : "Armature|Walk",
"length" : 1,
"loops" : false
},
"sprintSystem" : {
"maxVelocity" : 5.8,
"staminaMax" : 500,
"animationStartUp" : {
"name" : "SprintStart",
"length" : 1,
"loops" : false
},
"animationMain" : {
"name" : "Sprint",
"length" : 1,
"loops" : false
}
}
}
],
"rotatorSystem" : {
"rotatorItems" : [
{
"boneName" : "myTorsoBone",
"constraints" : [
{
"followsView" : true,
"followsBone" : false,
"parentBone" : "",
"allowedMargin" : 0.2
}
]
},
{
"boneName" : "myLeftLegBone",
"constraints" : [
{
"followsView" : false,
"followsBone" : true,
"parentBone" : "myTorsoBone",
"allowedMargin" : 0.2
}
]
},
{
"boneName" : "myRightLegBone",
"constraints" : [
{
"followsView" : false,
"followsBone" : true,
"parentBone" : "myTorsoBone",
"allowedMargin" : 0.2
}
]
}
]
},
"collidable" : {
"type" : "CYLINDER",
"dimension1" : 0.1,
"dimension2" : 0.45,
"dimension3" : 0.1,
"offsetX" : 0,
"offsetY" : 0.45,
"offsetZ" : 0
},
"attackMoves" : [
{
"type" : "MELEE_WEAPON_SWING_ONE_HAND",
"animationName" : "Armature|SwingWeapon",
"damageStartFrame" : 30,
"damageEndFrame" : 60,
"nextMoveId" : "",
"nextAttackMoveWindowStart" : 0,
"nextAttackMoveWindowEnd" : 1,
"movementStart" : 0,
"movementEnd" : 0,
"movementGoal" : 0,
"initialMove" : true
}
],
"healthSystem" : {
"maxHealth" : 100,
"onDamageIFrames" : 30
},
"modelPath" : "Models/baseman.fbx"
}
],
"files" : []
}

BIN
assets/Models/baseman5.fbx
View File

Binary file not shown.

BIN
assets/Models/hairshort1meshed.fbx Normal file
View File

Binary file not shown.

BIN
assets/Models/person1animpass2.fbx
View File

Binary file not shown.

BIN
assets/Models/person1walkanim.fbx
View File

Binary file not shown.

2
assets/Textures/default_texture_map.json
View File

@ -328,7 +328,7 @@
"/Textures/shorts1.png"
]
},
"Models/hairshort1.fbx" : {
"Models/hairshort1meshed.fbx" : {
"Hair" : [
"/Textures/b1.png",
"/Textures/b1.png"

2
src/main/java/electrosphere/main/Main.java
View File

@ -104,8 +104,6 @@ public class Main {
//load user settings
UserSettings.loadUserSettings();
// Globals.RUN_CLIENT = false;
//controls
if(Globals.RUN_CLIENT){
initControlHandler();

13
src/main/java/electrosphere/menu/MenuGeneratorsMultiplayer.java
View File

@ -172,6 +172,19 @@ public class MenuGeneratorsMultiplayer {
variantCarousel.setOnValueChangeCallback(new ValueChangeEventCallback(){public void execute(ValueChangeEvent event) {
//TODO: implement updating visuals
template.getValue(attribute.getAttributeId()).setVariantId(event.getAsString());
AttributeVariant variant = null;
for(AttributeVariant variantCurrent : attribute.getVariants()){
if(variantCurrent.getId().equals(event.getAsString())){
variant = variantCurrent;
break;
}
}
if(variant != null){
Globals.assetManager.addModelPathToQueue(variant.getModel());
for(String mesh : variant.getMeshes()){
characterActor.getMeshMask().queueMesh(variant.getModel(), mesh);
}
}
}});
controlsToAdd.add(variantCarousel);
}