James Melkonian
7f9ab102c7
Make RRT pathfinding a cfg feature
2021-09-17 16:01:20 -07:00
James Melkonian
746840404c
Disable RRT pathfinding
2021-09-17 16:01:19 -07:00
James Melkonian
235e2def3b
Initial RRT flight pathfinding
2021-09-17 16:01:19 -07:00
James Melkonian
bb48d20a37
Prettier town houses
2021-09-17 15:49:14 -07:00
James Melkonian
7a72df7e27
Gable primitive and dungeon lava rooms
2021-09-17 15:45:26 -07:00
Joshua Barretto
a015035510
Use previous position caches for airship collision detection
2021-09-17 22:34:28 +01:00
Imbris
ada61107f9
Merge branch 'anomaluridae/cleanup-interactable' into 'master'
...
Seperation of targets vs interactables. Cleaner cursor interactions.
See merge request veloren/veloren!2754
2021-09-17 19:25:08 +00:00
Joshua Barretto
3bebf1febe
Merge branch 'juliancoffee/remove_level' into 'master'
...
Rename level in EntityInfo to health_scaling and small cleaning
See merge request veloren/veloren!2850
2021-09-17 17:38:10 +00:00
anomaluridae
d0629224d2
remove unneeded mut, provide default_select_pos to secondry key event handler, and use the is_filled() over the is_opaque() to be reader friendly
2021-09-17 10:34:20 -07:00
anomaluridae
dc76d5c05f
is_solid() detects both solid rock and sprites (e.g. mineable ore). when in build mode, would like to be able to still mine if user cursor is over a mineable ore. so need to properly cast the build ray to use opaque (not fillable) blocks to get the proper position, vs the mineable block which may be nearer
2021-09-17 10:34:20 -07:00
anomaluridae
f3d8adf3fa
choose nearest target, from a specific subset of targets, for scene highlighting vs interactable vs game primary/secondary key input
2021-09-17 10:34:20 -07:00
anomaluridae
a7cee0f11b
keep MAX_TARGET_RANGE within voxygen
2021-09-17 10:34:20 -07:00
anomaluridae
2789d2ae29
intentional use of terrain targeting and select_pos as passed to the event handler. select_pos is None when not needed.
2021-09-17 10:34:20 -07:00
anomaluridae
a02488ddd9
properly use the target vs pickup range, in choosing the interactable. when finding the target_entity, use the proper limited dist range (cast_dist) with the proper upper bounds.
2021-09-17 10:34:20 -07:00
anomaluridae
0f13db9600
make the ContollerInputs.select_pos be explicitly the breakable blacks for mining
2021-09-17 10:34:20 -07:00
anomaluridae
07cfa0ef35
add comment for future direction of Interactables.
2021-09-17 10:34:20 -07:00
anomaluridae
b1adc9c4e0
build positions for place versus remove block are cleaner (less likely to fail) when apply the +0.01 modifier versus -0.01 modifier selectively. this is equivalent to current master, and is simply more explicit now
2021-09-17 10:34:20 -07:00
anomaluridae
9ddc38ba18
changes per MR feedback. simplier Option handling with zip, filter, and fewr unwraps. use kind keyword (not typed). if lets when possible. additional syntax cleanup
2021-09-17 10:34:20 -07:00
anomaluridae
946ca442ab
make Target generic, over the specific typed targets
2021-09-17 10:34:20 -07:00
anomaluridae
01cfe39503
undo macro use for DRY on client event handler, and handle edge detection in mining so that we don't get Empty interactables.
2021-09-17 10:34:20 -07:00
anomaluridae
25c3d2a9e2
MR review updates. Added back the 0.01 modifiers, update naming and comments, keep interactable construction in the interactables mod, remove unneeded curry, syntax updates. only cast for mining and build if enabled.
2021-09-17 10:34:20 -07:00
anomaluridae
20c4054e6a
build is working. to add and remove blocks.
2021-09-17 10:34:20 -07:00
anomaluridae
be1095632f
make Target into a typed struct. delineate the clear difference in Target versus Interactable. comments and naming cleanup, for more explicitness.
2021-09-17 10:34:20 -07:00
anomaluridae
4a723a7930
clippy is a thing
2021-09-17 10:34:20 -07:00
anomaluridae
42426a16f3
make scene interaction be targeted exactly on mining blocks (removing abnormal Empty labels), and don't reset position to None in the middle of mining.
2021-09-17 10:34:20 -07:00
anomaluridae
c8cb7fbe62
make the concepts of targets (under cursor), separate from interactable. interactable is what is (1) indicated visually in gui as able to interact, or (2) is an entity, or (3) is a block capable of Interaction. whereas a target is what occurs under the cursor, regardless of other state and input (such as different InputKind). targets are determined first, then other factors are cosidered to determine interactable.
2021-09-17 10:34:20 -07:00
anomaluridae
d9412b14d3
breakout interactable into seperate file
2021-09-17 10:32:06 -07:00
juliancoffee
294217f0c8
Clean entity assets for a small bit
...
- Move loot_tables/creature/witch to loot_tables/spots/witch
- Move skillset/spots/general_max and skillset/spots/sceptre_max to
skillset/preset/max/{general,sceptre}
- Remove tabs from dwarf_grave_robber entity config file
2021-09-17 20:12:42 +03:00
juliancoffee
d3e08ff663
Rename EntityInfo level field to health_scaling
2021-09-17 20:12:42 +03:00
Joshua Barretto
0b8e40581f
Merge branch 'juliancoffee/capsule_prism' into 'master'
...
New CapsulePrism collider
See merge request veloren/veloren!2843
2021-09-17 11:39:57 +00:00
juliancoffee
27a36abafd
Set z_min to 0 for terrain collision checks
...
This allows us have different z_min for e2e checks
2021-09-17 13:28:34 +03:00
juliancoffee
ab68c93724
Adress review
...
Make sausage ascii-art have `a` line inside of stadium
2021-09-17 13:28:34 +03:00
juliancoffee
938091e8a3
Adress review
...
- Rename Collider::get_radius to bounding_radius
- Check origin difference in CapsulePrism with EPSILON * 10.0 instead of
magic 0.00001
- Add comments for closest_points, hardnened expression against NaNs
- Add comments to try_e2e_collision function, renamed to
resolve_e2e_collision, make it return whether collision was triggered.
- Remove Collider::Box (it is Cylinder, which is subset of CapsulePrism
with p0=p1=Vec2::zero())
2021-09-17 13:28:34 +03:00
juliancoffee
07804607e0
Implement capsule2capsule collisions
2021-09-17 13:28:34 +03:00
juliancoffee
103c4d7ffb
Fix bug with zero-pushback for bigger colliders
2021-09-17 13:28:34 +03:00
juliancoffee
75954d289e
Fix beam offsets
...
- Introduce notion of min and max radius for Body instead of old
`radius()` function (which is renamed to `max_radius()`).
2021-09-17 13:28:34 +03:00
juliancoffee
d15900d613
Fix colliding bugs
...
- Make cylinder-like capsules prisms work without NaN in origin offsets.
Just return p0 as both origins instead of getting NaN by further
normalizing required because of how we rotate offsets.
- Fix pushback direction.
Make sure that pushback is calculated as our_pos - their_pos (and not
other way around).
- Fix colliding boundary detection.
Calculate center as Vec3::new(0, 0, height) and
not as `Vec3::new(0, height, 0)`.
2021-09-17 13:28:34 +03:00
juliancoffee
ab3e68f432
Refactor implementation of e2e collision
...
+ Add some hopefully helpful comments
+ Extract colliding tries to separate function
+ Move to Capsule + Cylinder collider combination instead of Capsule +
Capsule.
2021-09-17 13:28:34 +03:00
juliancoffee
e56478204e
Adress feedback
...
- Rewrite 2 * PI to TAU
- Some comment formatting
2021-09-17 13:28:34 +03:00
juliancoffee
58a4659c47
Remove body::Shape enum, make npc use CapsulePrism
2021-09-17 13:28:34 +03:00
juliancoffee
944e9263cb
Implement CapsulePrism collisions
2021-09-17 13:28:34 +03:00
juliancoffee
1bb1b9c34e
Refactor box_voxel_collision function
2021-09-17 13:28:34 +03:00
juliancoffee
feefd36036
Add CapsulePrism collider variant
...
+ Add placeholder physics collision implementation as copy of cylinder
Box collider.
+ Display it with debug hitboxes.
2021-09-17 13:28:34 +03:00
Samuel Keiffer
3f55337461
Merge branch 'ubruntu/another-trade-fix' into 'master'
...
Another trade fix
See merge request veloren/veloren!2844
2021-09-16 22:06:30 +00:00
ubruntu
db090c8112
Another trade fix
2021-09-16 22:06:30 +00:00
Imbris
699abadc95
Merge branch 'capucho/iced-checkbox' into 'master'
...
Add checkbox rendering logic for iced
See merge request veloren/veloren!2827
2021-09-15 17:30:57 +00:00
João Capucho
763f2b261c
Improve naming of checkbox images related methods
2021-09-15 15:41:31 +01:00
João Capucho
4bcdc31556
Add option for a hovered and checked background
2021-09-15 15:15:03 +01:00
Joshua Barretto
a78893862a
Merge branch 'sam/exp-fix' into 'master'
...
Fixed exp fix mistake and fixed lava, campfire, and bomb damage.
See merge request veloren/veloren!2845
2021-09-15 13:04:43 +00:00
Sam
46a6d21d63
Fixed exp fix mistake and fixed lava, campfire, and bomb damage.
2021-09-15 08:32:44 -04:00
