summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-02-08 23:58:04 +0100
committermetamuffin <metamuffin@disroot.org>2025-02-08 23:58:04 +0100
commit847542d358e65ea850cfeebdd92218aa60e34261 (patch)
tree7317b0c84bec217433bec4cc58231956d5303bc6
parent8ec0c2a7dbe832e71971e2c68dc929f2c86c8bc8 (diff)
downloadweareserver-847542d358e65ea850cfeebdd92218aa60e34261.tar
weareserver-847542d358e65ea850cfeebdd92218aa60e34261.tar.bz2
weareserver-847542d358e65ea850cfeebdd92218aa60e34261.tar.zst
small fixes
-rw-r--r--client/src/camera.rs4
-rw-r--r--shared/src/packets.rs4
-rw-r--r--world/src/main.rs5
3 files changed, 8 insertions, 5 deletions
diff --git a/client/src/camera.rs b/client/src/camera.rs
index ea984b3..78ce240 100644
--- a/client/src/camera.rs
+++ b/client/src/camera.rs
@@ -39,7 +39,9 @@ impl Camera {
}
}
pub fn update(&mut self, input_move: Vec3, input_rot: Vec2, dt: f32) {
- self.pos += self.rotation_mat() * (vec3(input_move.z, input_move.y, -input_move.x) * dt);
+ let speed = 3.;
+ let vel_local = vec3(input_move.z, input_move.y, -input_move.x) * dt * speed;
+ self.pos += self.rotation_mat() * vel_local;
self.rot.x += input_rot.x * -0.002;
self.rot.y += input_rot.y * -0.002;
}
diff --git a/shared/src/packets.rs b/shared/src/packets.rs
index 3cc9ea9..f44a953 100644
--- a/shared/src/packets.rs
+++ b/shared/src/packets.rs
@@ -174,11 +174,11 @@ impl ReadWrite for Packet {
0x09 => Packet::PrefabIndex(Resource::read(r)?),
0x0a => Packet::AnnouncePrefab(Resource::read(r)?),
0x0b => Packet::Chat(Object::read(r)?, Message::read(r)?),
- _ => {
+ tag => {
for _ in 0..packet_len.max(1) - 1 {
r.read_exact(&mut [0])?;
}
- bail!("unknown packet tag");
+ bail!("unknown packet tag {tag:x}");
}
})
}
diff --git a/world/src/main.rs b/world/src/main.rs
index 9dded85..055be47 100644
--- a/world/src/main.rs
+++ b/world/src/main.rs
@@ -150,7 +150,8 @@ fn main() -> Result<()> {
Some(i) => *i,
None => {
let a_ind = name.len();
- name.push(j.name().unwrap_or("").to_string());
+ // name.push(j.name().unwrap_or("").to_string());
+ name.push(format!("bone{}", a_ind));
transform.push(transform_to_affine(j.transform()));
parent_pre_map.push(
gltf.nodes()
@@ -321,7 +322,7 @@ fn main() -> Result<()> {
info!("adding object {ob}");
Packet::Add(ob, p.clone()).write(&mut sock)?;
if args.line_up {
- Packet::Position(ob, vec3a(i as f32 * 1.2, 0., i as f32 * 0.0), Vec3A::ZERO)
+ Packet::Position(ob, vec3a(i as f32 * 1.2, 0., i as f32 * 0.3), Vec3A::ZERO)
.write(&mut sock)?;
}
obs.push(ob);