cfgSkeletons indentation formatting fixes (#6796)

* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Fix class OFP2_ManSkeleton to have proper indentation for all bones

* Fix path. Fix whitespace
This commit is contained in:
Brandon Danyluk 2019-01-31 18:22:33 -07:00 committed by PabstMirror
parent d379c3f1b7
commit 639d3fdfa1
5 changed files with 538 additions and 567 deletions

View File

@ -1,11 +1,8 @@
class cfgSkeletons class cfgSkeletons {
{ class OFP2_ManSkeleton {
class OFP2_ManSkeleton
{
isDiscrete = 0; isDiscrete = 0;
skeletonInherit = ""; skeletonInherit = "";
SkeletonBones[]= skeletonBones[] = {
{
"Pelvis","", "Pelvis","",
"Spine","Pelvis", "Spine","Pelvis",
"Spine1","Spine", "Spine1","Spine",
@ -14,11 +11,9 @@ class cfgSkeletons
"camera","Pelvis",// case has changed for arma3 "camera","Pelvis",// case has changed for arma3
"weapon","Spine1", "weapon","Spine1",
"launcher","Spine1", "launcher","Spine1",
//Head skeleton in hierarchy
"Neck","Spine3", "Neck","Spine3",
"Neck1","Neck", "Neck1","Neck",
"Head","Neck1", "Head","Neck1", //Head skeleton in hierarchy
//Left upper side //Left upper side
"LeftShoulder","Spine3", "LeftShoulder","Spine3",
"LeftArm","LeftShoulder", "LeftArm","LeftShoulder",
@ -79,7 +74,6 @@ class cfgSkeletons
"RightLegRoll","RightLeg", "RightLegRoll","RightLeg",
"RightFoot","RightLegRoll", "RightFoot","RightLegRoll",
"RightToeBase","RightFoot", "RightToeBase","RightFoot",
//New facial features arma3 only //New facial features arma3 only
"Face_Hub","Head", "Face_Hub","Head",
"Face_Jawbone","Face_Hub", "Face_Jawbone","Face_Hub",
@ -119,6 +113,6 @@ class cfgSkeletons
"EyeRight","Face_Hub" "EyeRight","Face_Hub"
};// end of skeleton array };// end of skeleton array
// location of pivot points (local axes) for hierarchical animation // location of pivot points (local axes) for hierarchical animation
pivotsModel="Samples_F\TemplateRTM\ManSkeleton_Pivots.p3d"; pivotsModel="A3\anims_f\data\skeleton\SkeletonPivots.p3d";
}; };
}; };

View File

@ -1,11 +1,8 @@
class cfgSkeletons class cfgSkeletons {
{ class OFP2_ManSkeleton {
class OFP2_ManSkeleton
{
isDiscrete = 0; isDiscrete = 0;
skeletonInherit = ""; skeletonInherit = "";
SkeletonBones[]= skeletonBones[] = {
{
"Pelvis","", "Pelvis","",
"Spine","Pelvis", "Spine","Pelvis",
"Spine1","Spine", "Spine1","Spine",
@ -14,11 +11,9 @@ class cfgSkeletons
"camera","Pelvis",// case has changed for arma3 "camera","Pelvis",// case has changed for arma3
"weapon","Spine1", "weapon","Spine1",
"launcher","Spine1", "launcher","Spine1",
//Head skeleton in hierarchy
"Neck","Spine3", "Neck","Spine3",
"Neck1","Neck", "Neck1","Neck",
"Head","Neck1", "Head","Neck1", //Head skeleton in hierarchy
//Left upper side //Left upper side
"LeftShoulder","Spine3", "LeftShoulder","Spine3",
"LeftArm","LeftShoulder", "LeftArm","LeftShoulder",
@ -79,7 +74,6 @@ class cfgSkeletons
"RightLegRoll","RightLeg", "RightLegRoll","RightLeg",
"RightFoot","RightLegRoll", "RightFoot","RightLegRoll",
"RightToeBase","RightFoot", "RightToeBase","RightFoot",
//New facial features arma3 only //New facial features arma3 only
"Face_Hub","Head", "Face_Hub","Head",
"Face_Jawbone","Face_Hub", "Face_Jawbone","Face_Hub",
@ -119,6 +113,6 @@ class cfgSkeletons
"EyeRight","Face_Hub" "EyeRight","Face_Hub"
};// end of skeleton array };// end of skeleton array
// location of pivot points (local axes) for hierarchical animation // location of pivot points (local axes) for hierarchical animation
pivotsModel="Samples_F\TemplateRTM\ManSkeleton_Pivots.p3d"; pivotsModel="A3\anims_f\data\skeleton\SkeletonPivots.p3d";
}; };
}; };

View File

@ -1,4 +1,3 @@
class CfgSkeletons { class CfgSkeletons {
class Default { class Default {
isDiscrete = 1; isDiscrete = 1;
@ -15,17 +14,74 @@ class CfgSkeletons {
"Spine1","Spine", "Spine1","Spine",
"Spine2","Spine1", "Spine2","Spine1",
"Spine3","Spine2", "Spine3","Spine2",
"Camera","Pelvis", "camera","Pelvis",// case has changed for arma3
"weapon","Spine1", "weapon","Spine1",
"launcher","Spine1", "launcher","Spine1",
"Neck","Spine3",
//Head skeleton in hierarchy "Neck1","Neck",
"neck","Spine3", "Head","Neck1", //Head skeleton in hierarchy
"neck1","neck", //Left upper side
"head","neck1", "LeftShoulder","Spine3",
"LeftArm","LeftShoulder",
//New facial features "LeftArmRoll","LeftArm",
"Face_Hub","head", "LeftForeArm","LeftArmRoll",
"LeftForeArmRoll","LeftForeArm",
"LeftHand","LeftForeArmRoll",
"LeftHandRing","LeftHand",
"LeftHandRing1","LeftHandRing",
"LeftHandRing2","LeftHandRing1",
"LeftHandRing3","LeftHandRing2",
"LeftHandPinky1","LeftHandRing",
"LeftHandPinky2","LeftHandPinky1",
"LeftHandPinky3","LeftHandPinky2",
"LeftHandMiddle1","LeftHand",
"LeftHandMiddle2","LeftHandMiddle1",
"LeftHandMiddle3","LeftHandMiddle2",
"LeftHandIndex1","LeftHand",
"LeftHandIndex2","LeftHandIndex1",
"LeftHandIndex3","LeftHandIndex2",
"LeftHandThumb1","LeftHand",
"LeftHandThumb2","LeftHandThumb1",
"LeftHandThumb3","LeftHandThumb2",
//Right upper side
"RightShoulder","Spine3",
"RightArm","RightShoulder",
"RightArmRoll","RightArm",
"RightForeArm","RightArmRoll",
"RightForeArmRoll","RightForeArm",
"RightHand","RightForeArmRoll",
"RightHandRing","RightHand",
"RightHandRing1","RightHandRing",
"RightHandRing2","RightHandRing1",
"RightHandRing3","RightHandRing2",
"RightHandPinky1","RightHandRing",
"RightHandPinky2","RightHandPinky1",
"RightHandPinky3","RightHandPinky2",
"RightHandMiddle1","RightHand",
"RightHandMiddle2","RightHandMiddle1",
"RightHandMiddle3","RightHandMiddle2",
"RightHandIndex1","RightHand",
"RightHandIndex2","RightHandIndex1",
"RightHandIndex3","RightHandIndex2",
"RightHandThumb1","RightHand",
"RightHandThumb2","RightHandThumb1",
"RightHandThumb3","RightHandThumb2",
//Left lower side
"LeftUpLeg","Pelvis",
"LeftUpLegRoll","LeftUpLeg",
"LeftLeg","LeftUpLegRoll",
"LeftLegRoll","LeftLeg",
"LeftFoot","LeftLegRoll",
"LeftToeBase","LeftFoot",
//Right lower side
"RightUpLeg","Pelvis",
"RightUpLegRoll","RightUpLeg",
"RightLeg","RightUpLegRoll",
"RightLegRoll","RightLeg",
"RightFoot","RightLegRoll",
"RightToeBase","RightFoot",
//New facial features arma3 only
"Face_Hub","Head",
"Face_Jawbone","Face_Hub", "Face_Jawbone","Face_Hub",
"Face_Jowl","Face_Jawbone", "Face_Jowl","Face_Jawbone",
"Face_chopRight","Face_Jawbone", "Face_chopRight","Face_Jawbone",
@ -60,73 +116,8 @@ class CfgSkeletons {
"Face_EyelidLowerRight","Face_Hub", "Face_EyelidLowerRight","Face_Hub",
"Face_EyelidLowerLeft","Face_Hub", "Face_EyelidLowerLeft","Face_Hub",
"EyeLeft","Face_Hub", "EyeLeft","Face_Hub",
"EyeRight","Face_Hub", "EyeRight","Face_Hub"
};// end of skeleton array
//Left upper side
"LeftShoulder","Spine3",
"LeftArm","LeftShoulder",
"LeftArmRoll","LeftArm",
"LeftForeArm","LeftArmRoll",
"LeftForeArmRoll","LeftForeArm",
"LeftHand","LeftForeArmRoll",
"LeftHandRing","LeftHand",
"LeftHandRing1","LeftHandRing",
"LeftHandRing2","LeftHandRing1",
"LeftHandRing3","LeftHandRing2",
"LeftHandPinky1","LeftHandRing",
"LeftHandPinky2","LeftHandPinky1",
"LeftHandPinky3","LeftHandPinky2",
"LeftHandMiddle1","LeftHand",
"LeftHandMiddle2","LeftHandMiddle1",
"LeftHandMiddle3","LeftHandMiddle2",
"LeftHandIndex1","LeftHand",
"LeftHandIndex2","LeftHandIndex1",
"LeftHandIndex3","LeftHandIndex2",
"LeftHandThumb1","LeftHand",
"LeftHandThumb2","LeftHandThumb1",
"LeftHandThumb3","LeftHandThumb2",
//Right upper side
"RightShoulder","Spine3",
"RightArm","RightShoulder",
"RightArmRoll","RightArm",
"RightForeArm","RightArmRoll",
"RightForeArmRoll","RightForeArm",
"RightHand","RightForeArmRoll",
"RightHandRing","RightHand",
"RightHandRing1","RightHandRing",
"RightHandRing2","RightHandRing1",
"RightHandRing3","RightHandRing2",
"RightHandPinky1","RightHandRing",
"RightHandPinky2","RightHandPinky1",
"RightHandPinky3","RightHandPinky2",
"RightHandMiddle1","RightHand",
"RightHandMiddle2","RightHandMiddle1",
"RightHandMiddle3","RightHandMiddle2",
"RightHandIndex1","RightHand",
"RightHandIndex2","RightHandIndex1",
"RightHandIndex3","RightHandIndex2",
"RightHandThumb1","RightHand",
"RightHandThumb2","RightHandThumb1",
"RightHandThumb3","RightHandThumb2",
//Left lower side
"LeftUpLeg","Pelvis",
"LeftUpLegRoll","LeftUpLeg",
"LeftLeg","LeftUpLegRoll",
"LeftLegRoll","LeftLeg",
"LeftFoot","LeftLegRoll",
"LeftToeBase","LeftFoot",
//Right lower side
"RightUpLeg","Pelvis",
"RightUpLegRoll","RightUpLeg",
"RightLeg","RightUpLegRoll",
"RightLegRoll","RightLeg",
"RightFoot","RightLegRoll",
"RightToeBase","RightFoot"
};
// location of pivot points (local axes) for hierarchical animation // location of pivot points (local axes) for hierarchical animation
pivotsModel="A3\anims_f\data\skeleton\SkeletonPivots.p3d"; pivotsModel="A3\anims_f\data\skeleton\SkeletonPivots.p3d";
}; };

View File

@ -13,50 +13,12 @@ class CfgSkeletons {
"Spine1","Spine", "Spine1","Spine",
"Spine2","Spine1", "Spine2","Spine1",
"Spine3","Spine2", "Spine3","Spine2",
"Camera","Pelvis", "camera","Pelvis",// case has changed for arma3
"weapon","Spine1", "weapon","Spine1",
"launcher","Spine1", "launcher","Spine1",
//Head skeleton in hierarchy "Neck","Spine3",
"neck","Spine3", "Neck1","Neck",
"neck1","neck", "Head","Neck1", //Head skeleton in hierarchy
"head","neck1",
//New facial features
"Face_Hub","head",
"Face_Jawbone","Face_Hub",
"Face_Jowl","Face_Jawbone",
"Face_chopRight","Face_Jawbone",
"Face_chopLeft","Face_Jawbone",
"Face_LipLowerMiddle","Face_Jawbone",
"Face_LipLowerLeft","Face_Jawbone",
"Face_LipLowerRight","Face_Jawbone",
"Face_Chin","Face_Jawbone",
"Face_Tongue","Face_Jawbone",
"Face_CornerRight","Face_Hub",
"Face_CheekSideRight","Face_CornerRight",
"Face_CornerLeft","Face_Hub",
"Face_CheekSideLeft","Face_CornerLeft",
"Face_CheekFrontRight","Face_Hub",
"Face_CheekFrontLeft","Face_Hub",
"Face_CheekUpperRight","Face_Hub",
"Face_CheekUpperLeft","Face_Hub",
"Face_LipUpperMiddle","Face_Hub",
"Face_LipUpperRight","Face_Hub",
"Face_LipUpperLeft","Face_Hub",
"Face_NostrilRight","Face_Hub",
"Face_NostrilLeft","Face_Hub",
"Face_Forehead","Face_Hub",
"Face_BrowFrontRight","Face_Forehead",
"Face_BrowFrontLeft","Face_Forehead",
"Face_BrowMiddle","Face_Forehead",
"Face_BrowSideRight","Face_Forehead",
"Face_BrowSideLeft","Face_Forehead",
"Face_Eyelids","Face_Hub",
"Face_EyelidUpperRight","Face_Hub",
"Face_EyelidUpperLeft","Face_Hub",
"Face_EyelidLowerRight","Face_Hub",
"Face_EyelidLowerLeft","Face_Hub",
"EyeLeft","Face_Hub",
"EyeRight","Face_Hub",
//Left upper side //Left upper side
"LeftShoulder","Spine3", "LeftShoulder","Spine3",
"LeftArm","LeftShoulder", "LeftArm","LeftShoulder",
@ -116,8 +78,45 @@ class CfgSkeletons {
"RightLeg","RightUpLegRoll", "RightLeg","RightUpLegRoll",
"RightLegRoll","RightLeg", "RightLegRoll","RightLeg",
"RightFoot","RightLegRoll", "RightFoot","RightLegRoll",
"RightToeBase","RightFoot" "RightToeBase","RightFoot",
}; //New facial features arma3 only
"Face_Hub","Head",
"Face_Jawbone","Face_Hub",
"Face_Jowl","Face_Jawbone",
"Face_chopRight","Face_Jawbone",
"Face_chopLeft","Face_Jawbone",
"Face_LipLowerMiddle","Face_Jawbone",
"Face_LipLowerLeft","Face_Jawbone",
"Face_LipLowerRight","Face_Jawbone",
"Face_Chin","Face_Jawbone",
"Face_Tongue","Face_Jawbone",
"Face_CornerRight","Face_Hub",
"Face_CheekSideRight","Face_CornerRight",
"Face_CornerLeft","Face_Hub",
"Face_CheekSideLeft","Face_CornerLeft",
"Face_CheekFrontRight","Face_Hub",
"Face_CheekFrontLeft","Face_Hub",
"Face_CheekUpperRight","Face_Hub",
"Face_CheekUpperLeft","Face_Hub",
"Face_LipUpperMiddle","Face_Hub",
"Face_LipUpperRight","Face_Hub",
"Face_LipUpperLeft","Face_Hub",
"Face_NostrilRight","Face_Hub",
"Face_NostrilLeft","Face_Hub",
"Face_Forehead","Face_Hub",
"Face_BrowFrontRight","Face_Forehead",
"Face_BrowFrontLeft","Face_Forehead",
"Face_BrowMiddle","Face_Forehead",
"Face_BrowSideRight","Face_Forehead",
"Face_BrowSideLeft","Face_Forehead",
"Face_Eyelids","Face_Hub",
"Face_EyelidUpperRight","Face_Hub",
"Face_EyelidUpperLeft","Face_Hub",
"Face_EyelidLowerRight","Face_Hub",
"Face_EyelidLowerLeft","Face_Hub",
"EyeLeft","Face_Hub",
"EyeRight","Face_Hub"
};// end of skeleton array
// location of pivot points (local axes) for hierarchical animation // location of pivot points (local axes) for hierarchical animation
pivotsModel="A3\anims_f\data\skeleton\SkeletonPivots.p3d"; pivotsModel="A3\anims_f\data\skeleton\SkeletonPivots.p3d";
}; };

View File

@ -32,17 +32,74 @@ class CfgSkeletons {
"Spine1","Spine", "Spine1","Spine",
"Spine2","Spine1", "Spine2","Spine1",
"Spine3","Spine2", "Spine3","Spine2",
"Camera","Pelvis", "camera","Pelvis",// case has changed for arma3
"weapon","Spine1", "weapon","Spine1",
"launcher","Spine1", "launcher","Spine1",
"Neck","Spine3",
// Head skeleton in hierarchy "Neck1","Neck",
"neck","Spine3", "Head","Neck1", //Head skeleton in hierarchy
"neck1","neck", //Left upper side
"head","neck1", "LeftShoulder","Spine3",
"LeftArm","LeftShoulder",
// New facial features "LeftArmRoll","LeftArm",
"Face_Hub","head", "LeftForeArm","LeftArmRoll",
"LeftForeArmRoll","LeftForeArm",
"LeftHand","LeftForeArmRoll",
"LeftHandRing","LeftHand",
"LeftHandRing1","LeftHandRing",
"LeftHandRing2","LeftHandRing1",
"LeftHandRing3","LeftHandRing2",
"LeftHandPinky1","LeftHandRing",
"LeftHandPinky2","LeftHandPinky1",
"LeftHandPinky3","LeftHandPinky2",
"LeftHandMiddle1","LeftHand",
"LeftHandMiddle2","LeftHandMiddle1",
"LeftHandMiddle3","LeftHandMiddle2",
"LeftHandIndex1","LeftHand",
"LeftHandIndex2","LeftHandIndex1",
"LeftHandIndex3","LeftHandIndex2",
"LeftHandThumb1","LeftHand",
"LeftHandThumb2","LeftHandThumb1",
"LeftHandThumb3","LeftHandThumb2",
//Right upper side
"RightShoulder","Spine3",
"RightArm","RightShoulder",
"RightArmRoll","RightArm",
"RightForeArm","RightArmRoll",
"RightForeArmRoll","RightForeArm",
"RightHand","RightForeArmRoll",
"RightHandRing","RightHand",
"RightHandRing1","RightHandRing",
"RightHandRing2","RightHandRing1",
"RightHandRing3","RightHandRing2",
"RightHandPinky1","RightHandRing",
"RightHandPinky2","RightHandPinky1",
"RightHandPinky3","RightHandPinky2",
"RightHandMiddle1","RightHand",
"RightHandMiddle2","RightHandMiddle1",
"RightHandMiddle3","RightHandMiddle2",
"RightHandIndex1","RightHand",
"RightHandIndex2","RightHandIndex1",
"RightHandIndex3","RightHandIndex2",
"RightHandThumb1","RightHand",
"RightHandThumb2","RightHandThumb1",
"RightHandThumb3","RightHandThumb2",
//Left lower side
"LeftUpLeg","Pelvis",
"LeftUpLegRoll","LeftUpLeg",
"LeftLeg","LeftUpLegRoll",
"LeftLegRoll","LeftLeg",
"LeftFoot","LeftLegRoll",
"LeftToeBase","LeftFoot",
//Right lower side
"RightUpLeg","Pelvis",
"RightUpLegRoll","RightUpLeg",
"RightLeg","RightUpLegRoll",
"RightLegRoll","RightLeg",
"RightFoot","RightLegRoll",
"RightToeBase","RightFoot",
//New facial features arma3 only
"Face_Hub","Head",
"Face_Jawbone","Face_Hub", "Face_Jawbone","Face_Hub",
"Face_Jowl","Face_Jawbone", "Face_Jowl","Face_Jawbone",
"Face_chopRight","Face_Jawbone", "Face_chopRight","Face_Jawbone",
@ -77,72 +134,8 @@ class CfgSkeletons {
"Face_EyelidLowerRight","Face_Hub", "Face_EyelidLowerRight","Face_Hub",
"Face_EyelidLowerLeft","Face_Hub", "Face_EyelidLowerLeft","Face_Hub",
"EyeLeft","Face_Hub", "EyeLeft","Face_Hub",
"EyeRight","Face_Hub", "EyeRight","Face_Hub"
};// end of skeleton array
// Left upper side
"LeftShoulder","Spine3",
"LeftArm","LeftShoulder",
"LeftArmRoll","LeftArm",
"LeftForeArm","LeftArmRoll",
"LeftForeArmRoll","LeftForeArm",
"LeftHand","LeftForeArmRoll",
"LeftHandRing","LeftHand",
"LeftHandRing1","LeftHandRing",
"LeftHandRing2","LeftHandRing1",
"LeftHandRing3","LeftHandRing2",
"LeftHandPinky1","LeftHandRing",
"LeftHandPinky2","LeftHandPinky1",
"LeftHandPinky3","LeftHandPinky2",
"LeftHandMiddle1","LeftHand",
"LeftHandMiddle2","LeftHandMiddle1",
"LeftHandMiddle3","LeftHandMiddle2",
"LeftHandIndex1","LeftHand",
"LeftHandIndex2","LeftHandIndex1",
"LeftHandIndex3","LeftHandIndex2",
"LeftHandThumb1","LeftHand",
"LeftHandThumb2","LeftHandThumb1",
"LeftHandThumb3","LeftHandThumb2",
// Right upper side
"RightShoulder","Spine3",
"RightArm","RightShoulder",
"RightArmRoll","RightArm",
"RightForeArm","RightArmRoll",
"RightForeArmRoll","RightForeArm",
"RightHand","RightForeArmRoll",
"RightHandRing","RightHand",
"RightHandRing1","RightHandRing",
"RightHandRing2","RightHandRing1",
"RightHandRing3","RightHandRing2",
"RightHandPinky1","RightHandRing",
"RightHandPinky2","RightHandPinky1",
"RightHandPinky3","RightHandPinky2",
"RightHandMiddle1","RightHand",
"RightHandMiddle2","RightHandMiddle1",
"RightHandMiddle3","RightHandMiddle2",
"RightHandIndex1","RightHand",
"RightHandIndex2","RightHandIndex1",
"RightHandIndex3","RightHandIndex2",
"RightHandThumb1","RightHand",
"RightHandThumb2","RightHandThumb1",
"RightHandThumb3","RightHandThumb2",
// Left lower side
"LeftUpLeg","Pelvis",
"LeftUpLegRoll","LeftUpLeg",
"LeftLeg","LeftUpLegRoll",
"LeftLegRoll","LeftLeg",
"LeftFoot","LeftLegRoll",
"LeftToeBase","LeftFoot",
// Right lower side
"RightUpLeg","Pelvis",
"RightUpLegRoll","RightUpLeg",
"RightLeg","RightUpLegRoll",
"RightLegRoll","RightLeg",
"RightFoot","RightLegRoll",
"RightToeBase","RightFoot"
};
// location of pivot points (local axes) for hierarchical animation // location of pivot points (local axes) for hierarchical animation
pivotsModel="A3\anims_f\data\skeleton\SkeletonPivots.p3d"; pivotsModel="A3\anims_f\data\skeleton\SkeletonPivots.p3d";
}; };