Refactor/object position dimensions #93
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…SolidSurface` (note: player eye level + rendering and warren bear rendering positions are likely off from their expected locations
…d duplication object position and dimensions)
gilkeidar
added
enhancement
gilkeidar
requested review from
Tyler-Lentz,
dmin12,
atar13,
EddieJ03 and
jhparkt
Tyler-Lentz
reviewed
May 10, 2024
There was a problem hiding this comment.
I'm doing this on my phone while riding the bus, so I'll be able to test on my computer in a bit. I just left the one potential tiny comment which might be nice to have. Also, if we could remove the commented out code that would be nice, so we don't get confused later. I'll drop the approve in a bit once I verify it works on my laptop (which it should but just want to be sure)
Overall this is incredibly helpful! Thanks so much for grinding this out!
src/client/client.cpp
Outdated
| auto player_pos = glm::vec3(sharedObject->physics.position.x, sharedObject->physics.position.y + 0.1, sharedObject->physics.position.z); | ||
| //auto player_pos = glm::vec3(sharedObject->physics.position.x, sharedObject->physics.position.y + 0.1, sharedObject->physics.position.z); | ||
|
|
||
| auto player_pos = sharedObject->physics.corner + (sharedObject->physics.dimensions / 2.0f); |
There was a problem hiding this comment.
Maybe we can make a function on the Physics struct called getCenterPos that does this calculation for us?
jhparkt
approved these changes
May 10, 2024
Tyler-Lentz
approved these changes
May 10, 2024
…CollisionSphere()` and `detectCollisionBox()` to ensure correct behavior if the second argument of `detectCollision()` has `Collider::None`
…com/ucsd-cse125-sp24/group3 into refactor/object-position-dimensions
… argument has the expected collider type
…me code that did center position calculation with a call to this method
atar13
approved these changes
May 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactored
Objectposition + dimensions information to avoid state duplication which required careful syncing of different fields.Here is the new position + dimensions
Objectparadigm:Objectnow has aModelTypeenum field that specifies the rendering model that thisObjectshould render as by the client. (For the DM, this may require settingModelType::None(which doesn't exist currently) or the client can simply hard-code the behavior that the DM shouldn't be rendered regardless of its specified model type)Colliderfield in thePhysicsstruct has been replaced: instead of aCollider *to one of the derivedColliderclasses (BoxColliderorSphereCollider), it now has aColliderenum field which can be eitherBoxorSphere, with collision detection placed in global functions declared inserver/game/collider.hpp. This means colliders have no state and utilize theSharedPhysicsfields ofcorneranddimensionsto detect collisions.positionfield inSharedPhysicshas been removed.dimensionsfield inSharedSolidSurfacehas been removed.The
Objectclass now has a new static field:static std::unordered_map<ModelType, glm::vec3> modelswhich maps theModelTypeenum values to their model's default dimensions. Currently, these are all hard-coded inobject.cpp, but this can be replaced by the server reading the model object files upon initialization and populating this hash map dynamically.Note: The hard-coded dimensions for
ModelType::PlayerandModelType::WarrenBeardo NOT currently correspond to the actual model dimensions! Their values are my current guesses as I'm not sure how to extract the models' dimension data. If the player / warren bear do not render properly / in the right positions, this is likely why.Closes #90