Skip to content

Commit 22dada3

Browse files
author
xenon615
committed
edit readme
1 parent 4bd9136 commit 22dada3

File tree

8 files changed

+32
-24
lines changed

8 files changed

+32
-24
lines changed

.cargo/config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[target.wasm32-unknown-unknown]
2+
runner = "wasm-server-runner"

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,5 @@ features = [
6767
]
6868

6969
# wasm-bindgen --no-typescript --target web --out-dir ./web --out-name "siege" ./target/wasm32-unknown-unknown/release/siege.wasm
70-
# cargo build --target wasm32-unknown-unknown --release
70+
# cargo build --target wasm32-unknown-unknown --release
71+

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ _I must note that the percentage of hits on enemy shells depends on how drunk th
3030

3131
![Scene](img/scene.png)
3232

33-
<a href="https://xenon615.github.io/siege/" target="_blank">Demo(very slow at the moment)</a>
33+
<!-- <a href="https://xenon615.github.io/siege/" target="_blank">Demo(very slow at the moment)</a> -->
3434

3535
## Credits
3636
__Plong__, for very usefull thing which helped me a lot

src/camera.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use bevy::input::keyboard::KeyboardInput;
2-
use bevy::input::mouse::MouseMotion;
1+
// use bevy::input::keyboard::KeyboardInput;
2+
// use bevy::input::mouse::MouseMotion;
33
use bevy::prelude::*;
44
use bevy::core_pipeline::Skybox;
55
use bevy::render::camera::{Exposure, PhysicalCameraParameters};

src/fortress.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fn startup(
2929
assets: ResMut<AssetServer>,
3030
fp: Res<FortressPosition>
3131
) {
32-
cmd.spawn((NotReady, FortressTMP));
32+
cmd.spawn((NotReady, FortressTMP, Name::new("Fortress")));
3333
cmd.spawn((
3434
SceneRoot(assets.load(GltfAssetLabel::Scene(0).from_asset("models/fortress.glb"))),
3535
Transform::from_translation(fp.0),
@@ -54,8 +54,8 @@ fn setup (
5454
if let Ok(name) = name_q.get(c) {
5555
if name.starts_with("brick") || name.starts_with("disk") || name.starts_with("pillar") || name.starts_with("roof") {
5656
cmd.entity(c).insert((
57-
RigidBody::Dynamic,
58-
// RigidBody::Static,
57+
// RigidBody::Dynamic,
58+
RigidBody::Static,
5959
ColliderDensity(0.1),
6060
Friction::new(0.1)
6161
));

src/main.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
use bevy::{
33
// log::{Level, LogPlugin},
44
prelude::*,
5-
window::{
6-
// WindowMode,
7-
WindowPosition,
8-
WindowResolution
9-
}
5+
// window::{
6+
// // WindowMode,
7+
// WindowPosition,
8+
// WindowResolution
9+
// }
1010
};
1111
use avian3d::{
1212
prelude::{
@@ -109,7 +109,7 @@ fn check_ready(
109109
mut next: ResMut<NextState<GameState>>,
110110
) {
111111
if not_ready_q.is_empty() {
112-
println!("GAME!");
112+
info!("GAME!");
113113
next.set(GameState::Game);
114114
}
115115
}

src/radar.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
use std::f32::consts::PI;
22
use avian3d::prelude::{Collider, ShapeCastConfig, SpatialQuery, SpatialQueryFilter};
33
use bevy::scene::SceneInstanceReady;
4-
use bevy::{gizmos::gizmos, prelude::*};
4+
use bevy::{
5+
// gizmos::gizmos,
6+
prelude::*};
57
use crate::{animator::*, GameState};
68
use crate::shared::{GameLayer, SetTarget, Targetable};
79
use crate::field::FortressPosition;

src/trebuchet.rs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
use std::time::Duration;
22

3-
use bevy::{gizmos, prelude::*};
3+
use bevy::{
4+
// gizmos,
5+
prelude::*
6+
};
47
use avian3d::prelude::*;
58
use bevy::scene::SceneInstanceReady;
69

@@ -122,7 +125,7 @@ fn startup(
122125
))
123126
.observe(explore)
124127
;
125-
//info!("Trebuchet spawned");
128+
// info!("Trebuchet spawned");
126129
}
127130
}
128131

@@ -158,7 +161,7 @@ fn explore(
158161
}
159162
}
160163
cmd.entity(tr.entity()).insert(parts);
161-
//info!("Trebuchet explored");
164+
// info!("Trebuchet explored");
162165
}
163166

164167
// ---
@@ -281,7 +284,7 @@ fn setup(
281284
));
282285

283286
cmd.entity(treb_e).remove::<NotReady>();
284-
//info!("Trebuchet ready");
287+
// info!("Trebuchet ready");
285288

286289
}
287290

@@ -302,7 +305,7 @@ fn enter_idle(
302305
trigger: Trigger<OnAdd, StateIdle>,
303306
mut cmd: Commands,
304307
) {
305-
//info!("Trebuchet entered idle");
308+
// info!("Trebuchet entered idle");
306309
cmd.entity(trigger.entity()).insert(
307310
Interval(Timer::new(Duration::from_secs(fastrand::u64(5..10)), TimerMode::Once))
308311
);
@@ -328,7 +331,7 @@ fn enter_tension(
328331
Link
329332
)).id();
330333
parts.link = Some(joint_id);
331-
//info!("trebuchet {:?} entered tension ", treb_e);
334+
// info!("trebuchet {:?} entered tension ", treb_e);
332335
}
333336

334337
// ---
@@ -343,16 +346,17 @@ fn do_tension(
343346
let Ok(arm_t) = arm_q.get(treb_parts.arm) else {
344347
continue;
345348
};
346-
349+
347350
let arm_long_end_y = (arm_t.translation - arm_t.forward() * ARM_DIM.z * 0.5).y;
348351
if arm_long_end_y < ARM_LONG_END_Y {
349352
cmd.entity(treb_e)
350353
.remove::<StateTension>()
351354
.insert(StateArming)
352355
;
353-
//info!("trebuchet {:?} exited tension ", treb_e);
356+
// info!("trebuchet {:?} exited tension ", treb_e);
354357
continue;
355358
}
359+
356360
let Some(link_e) = treb_parts.link else {
357361
continue;
358362
};
@@ -362,7 +366,6 @@ fn do_tension(
362366
let Some(limits) = joint.length_limits else {
363367
continue;
364368
};
365-
366369
let j = DistanceJoint::new(joint.entity1, joint.entity2)
367370
.with_local_anchor_1(joint.local_anchor1);
368371

@@ -446,7 +449,7 @@ fn do_arming(
446449
// )
447450
.insert(LinearVelocity(Vec3::ZERO))
448451
;
449-
// //info!("trebuchet {:?} armed ", p);
452+
// info!("trebuchet {:?} armed ", p);
450453
}
451454
}
452455

0 commit comments

Comments
 (0)