kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

重置部分副武器手臂枢轴

Browse source
This commit is contained in:
Atsuihsio 2025-01-09 16:04:04 +08:00
parent b601350af7
commit ba02aa947f
14 changed files with 703 additions and 796 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock17ItemModel.java
View file

@ -63,13 +63,13 @@ public class Glock17ItemModel extends GeoModel<Glock17Item> {
double fp = ClientEventHandler.firePos; double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot; double fr = ClientEventHandler.fireRot;
gun.setPosX(2.23f * (float) zp); gun.setPosX(2.96f * (float) zp);
gun.setPosY(3.15f * (float) zp - (float) (0.2f * zpz)); gun.setPosY(2.43f * (float) zp - (float) (0.2f * zpz));
gun.setPosZ(5f * (float) zp + (float) (0.3f * zpz)); gun.setPosZ(7f * (float) zp + (float) (0.3f * zpz));
gun.setScaleZ(1f - (0.35f * (float) zp)); gun.setScaleZ(1f - (0.55f * (float) zp));
shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp)); shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp));
shen.setPosY((float) (0.25f * fp + 0.28f * fr)); shen.setPosY((float) (0.25f * fp + 0.28f * fr));

8
src/main/java/com/atsuishio/superbwarfare/client/model/item/Glock18ItemModel.java
View file

@ -72,13 +72,13 @@ public class Glock18ItemModel extends GeoModel<Glock18Item> {
double fp = ClientEventHandler.firePos; double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot; double fr = ClientEventHandler.fireRot;
gun.setPosX(2.23f * (float) zp); gun.setPosX(2.96f * (float) zp);
gun.setPosY(3.15f * (float) zp - (float) (0.2f * zpz)); gun.setPosY(2.43f * (float) zp - (float) (0.2f * zpz));
gun.setPosZ(5f * (float) zp + (float) (0.3f * zpz)); gun.setPosZ(7f * (float) zp + (float) (0.3f * zpz));
gun.setScaleZ(1f - (0.35f * (float) zp)); gun.setScaleZ(1f - (0.55f * (float) zp));
shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp)); shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp));
shen.setPosY((float) (0.25f * fp + 0.28f * fr)); shen.setPosY((float) (0.25f * fp + 0.28f * fr));

8
src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java
View file

@ -64,13 +64,13 @@ public class M1911ItemModel extends GeoModel<M1911Item> {
double fp = ClientEventHandler.firePos; double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot; double fr = ClientEventHandler.fireRot;
gun.setPosX(2.23f * (float) zp); gun.setPosX(2.96f * (float) zp);
gun.setPosY(3.15f * (float) zp - (float) (0.2f * zpz)); gun.setPosY(2.53f * (float) zp - (float) (0.2f * zpz));
gun.setPosZ(5f * (float) zp + (float) (0.3f * zpz)); gun.setPosZ(7f * (float) zp + (float) (0.3f * zpz));
gun.setScaleZ(1f - (0.35f * (float) zp)); gun.setScaleZ(1f - (0.55f * (float) zp));
shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp)); shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp));
shen.setPosY((float) (0.25f * fp + 0.28f * fr)); shen.setPosY((float) (0.25f * fp + 0.28f * fr));

8
src/main/java/com/atsuishio/superbwarfare/client/model/item/Mp443ItemModel.java
View file

@ -64,10 +64,10 @@ public class Mp443ItemModel extends GeoModel<Mp443Item> {
double fp = ClientEventHandler.firePos; double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot; double fr = ClientEventHandler.fireRot;
gun.setPosX(2.23f * (float) zp); gun.setPosX(2.96f * (float) zp);
gun.setPosY(3.25f * (float) zp - (float) (0.2f * zpz)); gun.setPosY(2.53f * (float) zp - (float) (0.2f * zpz));
gun.setPosZ(5f * (float) zp + (float) (0.3f * zpz)); gun.setPosZ(7f * (float) zp + (float) (0.3f * zpz));
gun.setScaleZ(1f - (0.35f * (float) zp)); gun.setScaleZ(1f - (0.55f * (float) zp));
shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp)); shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp));
shen.setPosY((float) (0.25f * fp + 0.28f * fr)); shen.setPosY((float) (0.25f * fp + 0.28f * fr));

8
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Glock17ItemRenderer.java
View file

@ -116,12 +116,12 @@ public class Glock17ItemRenderer extends GeoItemRenderer<Glock17Item> {
VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc));
if (name.equals("Lefthand")) { if (name.equals("Lefthand")) {
stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f);
AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
} else { } else {
stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f);
AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
} }
this.currentBuffer.getBuffer(this.renderType); this.currentBuffer.getBuffer(this.renderType);

8
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Glock18ItemRenderer.java
View file

@ -116,12 +116,12 @@ public class Glock18ItemRenderer extends GeoItemRenderer<Glock18Item> {
VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc));
if (name.equals("Lefthand")) { if (name.equals("Lefthand")) {
stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f);
AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
} else { } else {
stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f);
AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
} }
this.currentBuffer.getBuffer(this.renderType); this.currentBuffer.getBuffer(this.renderType);

8
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M1911ItemRenderer.java
View file

@ -116,12 +116,12 @@ public class M1911ItemRenderer extends GeoItemRenderer<M1911Item> {
VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc));
if (name.equals("Lefthand")) { if (name.equals("Lefthand")) {
stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f);
AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
} else { } else {
stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f);
AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
} }
this.currentBuffer.getBuffer(this.renderType); this.currentBuffer.getBuffer(this.renderType);

8
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mp443ItemRenderer.java
View file

@ -118,12 +118,12 @@ public class Mp443ItemRenderer extends GeoItemRenderer<Mp443Item> {
VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc));
if (name.equals("Lefthand")) { if (name.equals("Lefthand")) {
stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f);
AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
} else { } else {
stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f);
AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1);
} }
this.currentBuffer.getBuffer(this.renderType); this.currentBuffer.getBuffer(this.renderType);

177
src/main/resources/assets/superbwarfare/animations/glock17.animation.json
View file

@ -11,71 +11,27 @@
"bones": { "bones": {
"0": { "0": {
"rotation": { "rotation": {
"0.0": { "0.0": [4.74287, -58.94632, 9.89514],
"vector": [4.74287, -58.94632, 9.89514] "0.2": [-8.55104, -59.60571, 19.61648],
}, "0.4": [-8.58141, -58.99717, 19.60323],
"0.2": { "0.6": [-0.82277, -58.8651, 9.93666],
"vector": [-8.55104, -59.60571, 19.61648], "0.8": [4.74287, -58.94632, 9.89514]
"easing": "easeInSine"
},
"0.4": {
"vector": [-8.58141, -58.99717, 19.60323],
"easing": "easeOutSine"
},
"0.6": {
"vector": [-0.82277, -58.8651, 9.93666],
"easing": "easeInSine"
},
"0.8": {
"vector": [4.74287, -58.94632, 9.89514]
}
}, },
"position": { "position": {
"0.0": { "0.0": [5.5, -3, 0],
"vector": [5.5, -3, 0] "0.2": [3.75, -2.5, 0],
}, "0.4": [2.5, -3, 0],
"0.2": { "0.6": [4.25, -2.5, 0],
"vector": [3.75, -2.5, 0], "0.8": [5.5, -3, 0]
"easing": "easeInSine"
},
"0.4": {
"vector": [2.5, -3, 0],
"easing": "easeOutSine"
},
"0.6": {
"vector": [4.25, -2.5, 0],
"easing": "easeInSine"
},
"0.8": {
"vector": [5.5, -3, 0]
}
}
},
"Righthand": {
"rotation": {
"vector": [0, 12.5, 0]
},
"position": {
"vector": [2.19838, 0, -0.07415]
} }
}, },
"camera": { "camera": {
"rotation": { "rotation": {
"0.0": { "0.0": [-0.3, -0.3, 0.3],
"vector": [-0.3, -0.3, 0.3] "0.2": [0.3, 0, -0.3],
}, "0.4": [-0.3, 0.3, 0.3],
"0.2": { "0.6": [0.3, 0, -0.3],
"vector": [0.3, 0, -0.3] "0.8": [-0.3, -0.3, 0.3]
},
"0.4": {
"vector": [-0.3, 0.3, 0.3]
},
"0.6": {
"vector": [0.3, 0, -0.3]
},
"0.8": {
"vector": [-0.3, -0.3, 0.3]
}
} }
} }
} }
@ -86,74 +42,31 @@
"bones": { "bones": {
"0": { "0": {
"rotation": { "rotation": {
"0.0": { "0.0": [-64.40359, 6.54216, -8.29677],
"vector": [-64.40359, 6.54216, -8.29677] "0.175": [-63.64549, 6.90094, -2.09726],
}, "0.35": [-64.40359, 6.54216, -8.29677],
"0.175": { "0.525": [-65.4022, 6.21514, -14.3956],
"vector": [-63.64549, 6.90094, -2.09726], "0.7": [-64.40359, 6.54216, -8.29677]
"easing": "easeInSine"
},
"0.35": {
"vector": [-64.40359, 6.54216, -8.29677],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-65.4022, 6.21514, -14.3956],
"easing": "easeInSine"
},
"0.7": {
"vector": [-64.40359, 6.54216, -8.29677],
"easing": "easeOutSine"
}
}, },
"position": { "position": {
"0.0": { "0.0": [-8.5, 4, 2],
"vector": [-8.5, 4, 2], "0.175": [-8.5, 6, 3],
"easing": "easeOutSine" "0.35": [-10.5, 4, 2],
}, "0.525": [-9.5, 6, 2],
"0.175": { "0.7": [-8.5, 4, 2]
"vector": [-8.5, 6, 3],
"easing": "easeInSine"
},
"0.35": {
"vector": [-10.5, 4, 2],
"easing": "easeOutSine"
},
"0.525": {
"vector": [-9.5, 6, 2],
"easing": "easeInSine"
},
"0.7": {
"vector": [-8.5, 4, 2],
"easing": "easeOutSine"
}
} }
}, },
"Lefthand": { "Lefthand": {
"rotation": { "rotation": [-30, 0, 0],
"vector": [-1.41476, -16.33468, -1.66483] "position": [13, -2, 33]
},
"position": {
"vector": [6, -41, 27]
}
}, },
"camera": { "camera": {
"rotation": { "rotation": {
"0.0": { "0.0": [-0.3, -0.3, 0.3],
"vector": [-0.3, -0.3, 0.3] "0.175": [0.3, 0, -0.3],
}, "0.35": [-0.3, 0.3, 0.3],
"0.175": { "0.525": [0.3, 0, -0.3],
"vector": [0.3, 0, -0.3] "0.7": [-0.3, -0.3, 0.3]
},
"0.35": {
"vector": [-0.3, 0.3, 0.3]
},
"0.525": {
"vector": [0.3, 0, -0.3]
},
"0.7": {
"vector": [-0.3, -0.3, 0.3]
}
} }
} }
} }
@ -404,14 +317,14 @@
"Righthand": { "Righthand": {
"rotation": { "rotation": {
"0.0": [0, 0, 0], "0.0": [0, 0, 0],
"0.225": [5.40317, -4.29309, -3.01948], "0.225": [-8.40064, -6.41826, 4.29876],
"1.4": [5.40317, -4.29309, -3.01948], "1.4": [-8.40064, -6.41826, 4.29876],
"1.575": [0, 0, 0] "1.575": [0, 0, 0]
}, },
"position": { "position": {
"0.0": [0, 0, 0], "0.0": [0, 0, 0],
"0.225": [0, 0, 0], "0.225": [-1.45, 0, -0.15],
"1.4": [0, 0, 0], "1.4": [-1.45, 0, -0.15],
"1.575": [0, 0, 0] "1.575": [0, 0, 0]
} }
}, },
@ -780,29 +693,29 @@
"Righthand": { "Righthand": {
"rotation": { "rotation": {
"0.0": [0, 0, 0], "0.0": [0, 0, 0],
"0.225": [5.40317, -4.29309, -3.01948], "0.225": [-8.40064, -6.41826, 4.29876],
"1.475": [5.40317, -4.29309, -3.01948], "1.45": [-8.40064, -6.41826, 4.29876],
"1.575": [0, 0, 0] "1.575": [0, 0, 0]
}, },
"position": { "position": {
"0.0": [0, 0, 0], "0.0": [0, 0, 0],
"0.225": [0, 0, 0], "0.225": [-1.45, 0, -0.15],
"1.475": [0, 0, 0], "1.45": [-1.45, 0, -0.15],
"1.575": [0, 0, 0] "1.575": [0, 0, 0]
} }
}, },
"Lefthand": { "Lefthand": {
"rotation": { "rotation": {
"0.0": [0, 0, 0], "0.0": [0, 0, 0],
"0.3": [8.4751, 3.79173, -8.36955], "0.3": [-40.06045, -9.7354, 90.67677],
"1.25": [8.4751, 3.79173, -8.36955], "1.25": [-40.06045, -9.7354, 90.67677],
"1.4": [-15.10922, -10.96659, 49.74871], "1.4": [-28.56072, -11.0325, 75.91845],
"1.575": [0, 0, 0] "1.575": [0, 0, 0]
}, },
"position": { "position": {
"0.0": [0, 0, 0], "0.0": [0, 0, 0],
"0.3": [0, -3.9, 1.5], "0.3": [0, -3.3, 2.65],
"1.25": [0, -3.9, 1.5], "1.25": [0, -3.3, 2.65],
"1.4": [0, -1.3, 0.81], "1.4": [0, -1.3, 0.81],
"1.575": [0, 0, 0] "1.575": [0, 0, 0]
} }

80
src/main/resources/assets/superbwarfare/geo/glock17.geo.json
View file

@ -53,51 +53,11 @@
} }
] ]
}, },
{
"name": "Righthand",
"parent": "gun",
"pivot": [-2.78589, -3.86581, 11.33096],
"rotation": [105.10434, 9.14542, -177.74729],
"cubes": [
{
"origin": [-4.83589, -3.86581, 9.28096],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [0, 36], "uv_size": [1, 1]},
"east": {"uv": [0, 36], "uv_size": [1, 1]},
"south": {"uv": [0, 36], "uv_size": [1, 1]},
"west": {"uv": [0, 36], "uv_size": [1, 1]},
"up": {"uv": [1, 37], "uv_size": [-1, -1]},
"down": {"uv": [1, 37], "uv_size": [-1, -1]}
}
}
]
},
{ {
"name": "magazine", "name": "magazine",
"parent": "gun", "parent": "gun",
"pivot": [0, -0.3, 1.8] "pivot": [0, -0.3, 1.8]
}, },
{
"name": "Lefthand",
"parent": "magazine",
"pivot": [2.6976, -5.69887, 9.77824],
"rotation": [113.29762, -12.57035, 179.33701],
"cubes": [
{
"origin": [0.6476, -5.69887, 7.82824],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [0, 36], "uv_size": [1, 1]},
"east": {"uv": [0, 36], "uv_size": [1, 1]},
"south": {"uv": [0, 36], "uv_size": [1, 1]},
"west": {"uv": [0, 36], "uv_size": [1, 1]},
"up": {"uv": [1, 37], "uv_size": [-1, -1]},
"down": {"uv": [1, 37], "uv_size": [-1, -1]}
}
}
]
},
{ {
"name": "bullet", "name": "bullet",
"parent": "magazine", "parent": "magazine",
@ -259,6 +219,26 @@
} }
] ]
}, },
{
"name": "Lefthand",
"parent": "magazine",
"pivot": [0.5046, -1.09567, -0.32012],
"rotation": [-65.1011, -15.50044, 169.54592],
"cubes": [
{
"origin": [-1.4954, -2.09567, -2.32012],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [1.25, 32], "uv_size": [-1.25, -2]},
"east": {"uv": [1.25, 32], "uv_size": [-1.25, -2]},
"south": {"uv": [1.25, 32], "uv_size": [-1.25, -2]},
"west": {"uv": [1.25, 32], "uv_size": [-1.25, -2]},
"up": {"uv": [0, 30], "uv_size": [1.25, 2]},
"down": {"uv": [0, 30], "uv_size": [1.25, 2]}
}
}
]
},
{ {
"name": "body", "name": "body",
"parent": "gun", "parent": "gun",
@ -2630,6 +2610,26 @@
} }
} }
] ]
},
{
"name": "Righthand",
"parent": "gun",
"pivot": [-0.60468, -1.08634, 0.29587],
"rotation": [-76.32882, 10.3564, 179.6036],
"cubes": [
{
"origin": [-2.60468, -2.08634, -1.70413],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [1.25, 30], "uv_size": [-1.25, 2]},
"east": {"uv": [1.25, 30], "uv_size": [-1.25, 2]},
"south": {"uv": [1.25, 30], "uv_size": [-1.25, 2]},
"west": {"uv": [1.25, 30], "uv_size": [-1.25, 2]},
"up": {"uv": [0, 32], "uv_size": [1.25, -2]},
"down": {"uv": [0, 32], "uv_size": [1.25, -2]}
}
}
]
} }
] ]
} }

82
src/main/resources/assets/superbwarfare/geo/glock18.geo.json
View file

@ -53,51 +53,11 @@
} }
] ]
}, },
{
"name": "Righthand",
"parent": "gun",
"pivot": [-2.78589, -3.86581, 11.33096],
"rotation": [105.10434, 9.14542, -177.74729],
"cubes": [
{
"origin": [-4.83589, -3.86581, 9.28096],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [0, 36], "uv_size": [1, 1]},
"east": {"uv": [0, 36], "uv_size": [1, 1]},
"south": {"uv": [0, 36], "uv_size": [1, 1]},
"west": {"uv": [0, 36], "uv_size": [1, 1]},
"up": {"uv": [1, 37], "uv_size": [-1, -1]},
"down": {"uv": [1, 37], "uv_size": [-1, -1]}
}
}
]
},
{ {
"name": "magazine", "name": "magazine",
"parent": "gun", "parent": "gun",
"pivot": [0, -0.3, 1.8] "pivot": [0, -0.3, 1.8]
}, },
{
"name": "Lefthand",
"parent": "magazine",
"pivot": [2.6976, -5.69887, 9.77824],
"rotation": [113.29762, -12.57035, 179.33701],
"cubes": [
{
"origin": [0.6476, -5.69887, 7.82824],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [0, 36], "uv_size": [1, 1]},
"east": {"uv": [0, 36], "uv_size": [1, 1]},
"south": {"uv": [0, 36], "uv_size": [1, 1]},
"west": {"uv": [0, 36], "uv_size": [1, 1]},
"up": {"uv": [1, 37], "uv_size": [-1, -1]},
"down": {"uv": [1, 37], "uv_size": [-1, -1]}
}
}
]
},
{ {
"name": "bullet", "name": "bullet",
"parent": "magazine", "parent": "magazine",
@ -259,6 +219,26 @@
} }
] ]
}, },
{
"name": "Lefthand",
"parent": "magazine",
"pivot": [0.5046, -1.09567, -0.32012],
"rotation": [-65.1011, -15.50044, 169.54592],
"cubes": [
{
"origin": [-1.4954, -2.09567, -2.32012],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [1.25, 32], "uv_size": [-1.25, -2]},
"east": {"uv": [1.25, 32], "uv_size": [-1.25, -2]},
"south": {"uv": [1.25, 32], "uv_size": [-1.25, -2]},
"west": {"uv": [1.25, 32], "uv_size": [-1.25, -2]},
"up": {"uv": [0, 30], "uv_size": [1.25, 2]},
"down": {"uv": [0, 30], "uv_size": [1.25, 2]}
}
}
]
},
{ {
"name": "body", "name": "body",
"parent": "gun", "parent": "gun",
@ -2682,10 +2662,24 @@
] ]
}, },
{ {
"name": "roll", "name": "Righthand",
"parent": "0", "parent": "gun",
"pivot": [0, 0, 0], "pivot": [-0.60468, -1.08634, 0.29587],
"rotation": [0, 0, 11] "rotation": [-76.32882, 10.3564, 179.6036],
"cubes": [
{
"origin": [-2.60468, -2.08634, -1.70413],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [1.25, 30], "uv_size": [-1.25, 2]},
"east": {"uv": [1.25, 30], "uv_size": [-1.25, 2]},
"south": {"uv": [1.25, 30], "uv_size": [-1.25, 2]},
"west": {"uv": [1.25, 30], "uv_size": [-1.25, 2]},
"up": {"uv": [0, 32], "uv_size": [1.25, -2]},
"down": {"uv": [0, 32], "uv_size": [1.25, -2]}
}
}
]
} }
] ]
} }

58
src/main/resources/assets/superbwarfare/geo/m1911.geo.json
View file

@ -58,26 +58,6 @@
"parent": "gun", "parent": "gun",
"pivot": [0, -0.3, 1.8] "pivot": [0, -0.3, 1.8]
}, },
{
"name": "Lefthand",
"parent": "magazine",
"pivot": [2.6976, -5.69887, 9.77824],
"rotation": [113.29762, -12.57035, 179.33701],
"cubes": [
{
"origin": [0.6476, -5.69887, 7.82824],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [0, 36], "uv_size": [1, 1]},
"east": {"uv": [0, 36], "uv_size": [1, 1]},
"south": {"uv": [0, 36], "uv_size": [1, 1]},
"west": {"uv": [0, 36], "uv_size": [1, 1]},
"up": {"uv": [1, 37], "uv_size": [-1, -1]},
"down": {"uv": [1, 37], "uv_size": [-1, -1]}
}
}
]
},
{ {
"name": "bullet", "name": "bullet",
"parent": "magazine", "parent": "magazine",
@ -258,6 +238,26 @@
} }
] ]
}, },
{
"name": "Lefthand",
"parent": "magazine",
"pivot": [0.5046, -1.09567, -0.32012],
"rotation": [-65.1011, -15.50044, 169.54592],
"cubes": [
{
"origin": [-1.4954, -2.09567, -2.32012],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [1.25, 32], "uv_size": [-1.25, -2]},
"east": {"uv": [1.25, 32], "uv_size": [-1.25, -2]},
"south": {"uv": [1.25, 32], "uv_size": [-1.25, -2]},
"west": {"uv": [1.25, 32], "uv_size": [-1.25, -2]},
"up": {"uv": [0, 30], "uv_size": [1.25, 2]},
"down": {"uv": [0, 30], "uv_size": [1.25, 2]}
}
}
]
},
{ {
"name": "body", "name": "body",
"parent": "gun", "parent": "gun",
@ -3255,19 +3255,19 @@
{ {
"name": "Righthand", "name": "Righthand",
"parent": "gun", "parent": "gun",
"pivot": [-2.78589, -3.86581, 11.33096], "pivot": [-0.60468, -1.08634, 0.29587],
"rotation": [105.10434, 9.14542, -177.74729], "rotation": [-76.32882, 10.3564, 179.6036],
"cubes": [ "cubes": [
{ {
"origin": [-4.83589, -3.86581, 9.28096], "origin": [-2.60468, -2.08634, -1.70413],
"size": [4, 12, 4], "size": [4, 12, 4],
"uv": { "uv": {
"north": {"uv": [0, 36], "uv_size": [1, 1]}, "north": {"uv": [1.25, 30], "uv_size": [-1.25, 2]},
"east": {"uv": [0, 36], "uv_size": [1, 1]}, "east": {"uv": [1.25, 30], "uv_size": [-1.25, 2]},
"south": {"uv": [0, 36], "uv_size": [1, 1]}, "south": {"uv": [1.25, 30], "uv_size": [-1.25, 2]},
"west": {"uv": [0, 36], "uv_size": [1, 1]}, "west": {"uv": [1.25, 30], "uv_size": [-1.25, 2]},
"up": {"uv": [1, 37], "uv_size": [-1, -1]}, "up": {"uv": [0, 32], "uv_size": [1.25, -2]},
"down": {"uv": [1, 37], "uv_size": [-1, -1]} "down": {"uv": [0, 32], "uv_size": [1.25, -2]}
} }
} }
] ]

1032
src/main/resources/assets/superbwarfare/geo/mp443.geo.json
View file

File diff suppressed because it is too large Load diff

6
src/main/resources/assets/superbwarfare/models/displaysettings/glock17.item.json
View file

@ -33,9 +33,9 @@
}, },
"firstperson_righthand": { "firstperson_righthand": {
"translation": [ "translation": [
-6.75, -6.0,
1.75, 2.5,
-2.5 -1.5
] ]
}, },
"firstperson_lefthand": { "firstperson_lefthand": {