调整BMP2贴图,修复手持武器低帧率歪镜子的bug
This commit is contained in:
parent
899a1ddd1f
commit
014145bf33
3 changed files with 95 additions and 55 deletions
|
@ -1050,7 +1050,11 @@ public class ClientEventHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
fireSpread = Mth.clamp(fireSpread - 0.1 * (Math.pow(fireSpread, 2) * times), 0, 2);
|
fireSpread = Mth.clamp(fireSpread - 0.1 * (Math.pow(fireSpread, 2) * times), 0, 2);
|
||||||
firePosZ = Mth.clamp(firePosZ - 1.2 * (Math.pow(firePosZ, 2) * times), 0, 1.5) * 0.95;
|
firePosZ = Mth.clamp(firePosZ - 1.2 * (Math.pow(firePosZ, 2) * times), 0, 1.5);
|
||||||
|
|
||||||
|
firePosZ *= 0.96f;
|
||||||
|
firePos *= 0.96f;
|
||||||
|
fireRot *= 0.96f;
|
||||||
|
|
||||||
if (0 < firePosTimer) {
|
if (0 < firePosTimer) {
|
||||||
firePosTimer += 0.35 * (1.1 - firePosTimer) * times;
|
firePosTimer += 0.35 * (1.1 - firePosTimer) * times;
|
||||||
|
|
|
@ -20,6 +20,42 @@
|
||||||
"parent": "root",
|
"parent": "root",
|
||||||
"pivot": [8.80313, 29.95888, -40.51605],
|
"pivot": [8.80313, 29.95888, -40.51605],
|
||||||
"cubes": [
|
"cubes": [
|
||||||
|
{
|
||||||
|
"origin": [32.67205, 28.80662, -36.56451],
|
||||||
|
"size": [0.0184, 5.888, 40.48],
|
||||||
|
"pivot": [32.68125, 31.75062, -16.32451],
|
||||||
|
"rotation": [0, 0, -14],
|
||||||
|
"uv": {
|
||||||
|
"west": {"uv": [110, 107.25], "uv_size": [-110, 16]}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"origin": [-11.2155, 16.11826, 61.65521],
|
||||||
|
"size": [0.0184, 10, 10],
|
||||||
|
"pivot": [-11.2063, 21.61826, 67.15521],
|
||||||
|
"rotation": [-90, -77, 90],
|
||||||
|
"uv": {
|
||||||
|
"west": {"uv": [93.75, 87.75], "uv_size": [4.5, 4.5]}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"origin": [-0.5092, 12.16933, -81.66136],
|
||||||
|
"size": [0.0184, 16, 16],
|
||||||
|
"pivot": [0, 23.16933, -73.66136],
|
||||||
|
"rotation": [90, 33.5, 90],
|
||||||
|
"uv": {
|
||||||
|
"west": {"uv": [93.75, 87.75], "uv_size": [4.5, 4.5]}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"origin": [-32.69045, 28.80662, -36.56451],
|
||||||
|
"size": [0.0184, 5.888, 40.48],
|
||||||
|
"pivot": [-32.68125, 31.75062, -16.32451],
|
||||||
|
"rotation": [0, 0, 14],
|
||||||
|
"uv": {
|
||||||
|
"east": {"uv": [0, 107.25], "uv_size": [110, 16]}
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"origin": [28.41511, 26.26014, -72.81939],
|
"origin": [28.41511, 26.26014, -72.81939],
|
||||||
"size": [5.25, 2.4, 9.25],
|
"size": [5.25, 2.4, 9.25],
|
||||||
|
@ -4094,9 +4130,9 @@
|
||||||
"pivot": [33.13139, 30.13174, -23.87402],
|
"pivot": [33.13139, 30.13174, -23.87402],
|
||||||
"cubes": [
|
"cubes": [
|
||||||
{
|
{
|
||||||
"origin": [31.01692, 29.03174, -38.70173],
|
"origin": [31.01692, 29.03174, -48.70173],
|
||||||
"size": [3.02894, 5, 8.05541],
|
"size": [3.02894, 5, 8.05541],
|
||||||
"pivot": [33.53139, 30.13174, -23.87402],
|
"pivot": [33.53139, 30.13174, -33.87402],
|
||||||
"rotation": [0, 0, -15],
|
"rotation": [0, 0, -15],
|
||||||
"uv": {
|
"uv": {
|
||||||
"north": {"uv": [89, 10], "uv_size": [1, 1]},
|
"north": {"uv": [89, 10], "uv_size": [1, 1]},
|
||||||
|
@ -8922,10 +8958,10 @@
|
||||||
"pivot": [30, 20.27286, -60.10428],
|
"pivot": [30, 20.27286, -60.10428],
|
||||||
"rotation": [45.25, 0, 0],
|
"rotation": [45.25, 0, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"east": {"uv": [63, 92], "uv_size": [1, 1]},
|
"east": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"west": {"uv": [63, 92], "uv_size": [1, 1]},
|
"west": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"up": {"uv": [64, 93], "uv_size": [-1, -1]},
|
"up": {"uv": [63, 93], "uv_size": [1, -1]},
|
||||||
"down": {"uv": [64, 93], "uv_size": [-1, -1]}
|
"down": {"uv": [63, 93], "uv_size": [1, -1]}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -8934,10 +8970,10 @@
|
||||||
"pivot": [30, 24.93117, -55.08519],
|
"pivot": [30, 24.93117, -55.08519],
|
||||||
"rotation": [-0.25, 0, 0],
|
"rotation": [-0.25, 0, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"east": {"uv": [63, 92], "uv_size": [1, 1]},
|
"east": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"west": {"uv": [63, 92], "uv_size": [1, 1]},
|
"west": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"up": {"uv": [64, 93], "uv_size": [-1, -1]},
|
"up": {"uv": [63, 93], "uv_size": [1, -1]},
|
||||||
"down": {"uv": [64, 93], "uv_size": [-1, -1]}
|
"down": {"uv": [63, 93], "uv_size": [1, -1]}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -8946,10 +8982,10 @@
|
||||||
"pivot": [30, 19.77327, 59.93548],
|
"pivot": [30, 19.77327, 59.93548],
|
||||||
"rotation": [-45.25, 0, 0],
|
"rotation": [-45.25, 0, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"east": {"uv": [63, 92], "uv_size": [1, 1]},
|
"east": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"west": {"uv": [63, 92], "uv_size": [1, 1]},
|
"west": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"up": {"uv": [64, 93], "uv_size": [-1, -1]},
|
"up": {"uv": [63, 93], "uv_size": [1, -1]},
|
||||||
"down": {"uv": [64, 93], "uv_size": [-1, -1]}
|
"down": {"uv": [63, 93], "uv_size": [1, -1]}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -8958,10 +8994,10 @@
|
||||||
"pivot": [30, 19.77327, 59.93548],
|
"pivot": [30, 19.77327, 59.93548],
|
||||||
"rotation": [-90.25, 0, 0],
|
"rotation": [-90.25, 0, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"east": {"uv": [63, 92], "uv_size": [1, 1]},
|
"east": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"west": {"uv": [63, 92], "uv_size": [1, 1]},
|
"west": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"up": {"uv": [64, 93], "uv_size": [-1, -1]},
|
"up": {"uv": [63, 93], "uv_size": [1, -1]},
|
||||||
"down": {"uv": [64, 93], "uv_size": [-1, -1]}
|
"down": {"uv": [63, 93], "uv_size": [1, -1]}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -8970,10 +9006,10 @@
|
||||||
"pivot": [30, 11.03653, 55.25669],
|
"pivot": [30, 11.03653, 55.25669],
|
||||||
"rotation": [-147.75, 0, 0],
|
"rotation": [-147.75, 0, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"east": {"uv": [63, 92], "uv_size": [1, 1]},
|
"east": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"west": {"uv": [63, 92], "uv_size": [1, 1]},
|
"west": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"up": {"uv": [64, 93], "uv_size": [-1, -1]},
|
"up": {"uv": [63, 93], "uv_size": [1, -1]},
|
||||||
"down": {"uv": [64, 93], "uv_size": [-1, -1]}
|
"down": {"uv": [63, 93], "uv_size": [1, -1]}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -8982,10 +9018,10 @@
|
||||||
"pivot": [30, 2.12908, 41.48198],
|
"pivot": [30, 2.12908, 41.48198],
|
||||||
"rotation": [180, 0, 0],
|
"rotation": [180, 0, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"east": {"uv": [63, 92], "uv_size": [1, 1]},
|
"east": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"west": {"uv": [63, 92], "uv_size": [1, 1]},
|
"west": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"up": {"uv": [64, 93], "uv_size": [-1, -1]},
|
"up": {"uv": [63, 93], "uv_size": [1, -1]},
|
||||||
"down": {"uv": [64, 93], "uv_size": [-1, -1]}
|
"down": {"uv": [63, 93], "uv_size": [1, -1]}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -8994,34 +9030,34 @@
|
||||||
"pivot": [30, 11.60338, 56.50044],
|
"pivot": [30, 11.60338, 56.50044],
|
||||||
"rotation": [-135.25, 0, 0],
|
"rotation": [-135.25, 0, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"east": {"uv": [63, 92], "uv_size": [1, 1]},
|
"east": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"west": {"uv": [63, 92], "uv_size": [1, 1]},
|
"west": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"up": {"uv": [64, 93], "uv_size": [-1, -1]},
|
"up": {"uv": [63, 93], "uv_size": [1, -1]},
|
||||||
"down": {"uv": [64, 93], "uv_size": [-1, -1]}
|
"down": {"uv": [63, 93], "uv_size": [1, -1]}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"origin": [26.9, 10.76354, -72.49982],
|
"origin": [26.9, 11.37349, -72.06169],
|
||||||
"size": [6.2, 1.1, 18.3],
|
"size": [6.2, 1.1, 21],
|
||||||
"pivot": [30, 10.30691, -55.3571],
|
"pivot": [30, 10.91686, -54.91897],
|
||||||
"rotation": [150.75, 0, 0],
|
"rotation": [148.25, 0, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"east": {"uv": [63, 92], "uv_size": [1, 1]},
|
"east": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"west": {"uv": [63, 92], "uv_size": [1, 1]},
|
"west": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"up": {"uv": [64, 93], "uv_size": [-1, -1]},
|
"up": {"uv": [63, 93], "uv_size": [1, -1]},
|
||||||
"down": {"uv": [64, 93], "uv_size": [-1, -1]}
|
"down": {"uv": [63, 93], "uv_size": [1, -1]}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"origin": [26.9, 10.79644, -55.5956],
|
"origin": [26.9, 10.79644, -52.7956],
|
||||||
"size": [6.2, 1.1, 6.99],
|
"size": [6.2, 1.1, 4.19],
|
||||||
"pivot": [30, 10.36633, -55.83431],
|
"pivot": [30, 10.36633, -55.83431],
|
||||||
"rotation": [132.25, 0, 0],
|
"rotation": [132.25, 0, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"east": {"uv": [63, 92], "uv_size": [1, 1]},
|
"east": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"west": {"uv": [63, 92], "uv_size": [1, 1]},
|
"west": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"up": {"uv": [64, 93], "uv_size": [-1, -1]},
|
"up": {"uv": [63, 93], "uv_size": [1, -1]},
|
||||||
"down": {"uv": [64, 93], "uv_size": [-1, -1]}
|
"down": {"uv": [63, 93], "uv_size": [1, -1]}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -9030,10 +9066,10 @@
|
||||||
"pivot": [30, 20.09532, -60.28029],
|
"pivot": [30, 20.09532, -60.28029],
|
||||||
"rotation": [90.25, 0, 0],
|
"rotation": [90.25, 0, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"east": {"uv": [63, 92], "uv_size": [1, 1]},
|
"east": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"west": {"uv": [63, 92], "uv_size": [1, 1]},
|
"west": {"uv": [64, 92], "uv_size": [-1, 1]},
|
||||||
"up": {"uv": [64, 93], "uv_size": [-1, -1]},
|
"up": {"uv": [63, 93], "uv_size": [1, -1]},
|
||||||
"down": {"uv": [64, 93], "uv_size": [-1, -1]}
|
"down": {"uv": [63, 93], "uv_size": [1, -1]}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -10433,10 +10469,10 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"origin": [-33.1, 10.76354, -72.49982],
|
"origin": [-33.1, 11.37349, -72.06169],
|
||||||
"size": [6.2, 1.1, 18.3],
|
"size": [6.2, 1.1, 21],
|
||||||
"pivot": [-30, 10.30691, -55.3571],
|
"pivot": [-30, 10.91686, -54.91897],
|
||||||
"rotation": [150.75, 0, 0],
|
"rotation": [148.25, 0, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
"east": {"uv": [63, 92], "uv_size": [1, 1]},
|
"east": {"uv": [63, 92], "uv_size": [1, 1]},
|
||||||
"west": {"uv": [63, 92], "uv_size": [1, 1]},
|
"west": {"uv": [63, 92], "uv_size": [1, 1]},
|
||||||
|
@ -10445,8 +10481,8 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"origin": [-33.1, 10.79644, -55.5956],
|
"origin": [-33.1, 10.79644, -52.7956],
|
||||||
"size": [6.2, 1.1, 6.99],
|
"size": [6.2, 1.1, 4.19],
|
||||||
"pivot": [-30, 10.36633, -55.83431],
|
"pivot": [-30, 10.36633, -55.83431],
|
||||||
"rotation": [132.25, 0, 0],
|
"rotation": [132.25, 0, 0],
|
||||||
"uv": {
|
"uv": {
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 17 KiB |
Loading…
Add table
Reference in a new issue