이대로 제출해버릴까..
This commit is contained in:
@@ -103,6 +103,7 @@ struct Model {
|
||||
material = std::move(other.material);
|
||||
original_offset = other.original_offset;
|
||||
owner = other.owner;
|
||||
OwnerID = ID;
|
||||
radius = other.radius;
|
||||
lifespan = other.lifespan;
|
||||
OnColision = other.OnColision;
|
||||
@@ -148,6 +149,7 @@ struct Model {
|
||||
glm::vec3 original_offset = glm::vec3(0.f);
|
||||
|
||||
std::weak_ptr<Model> owner;
|
||||
utils::Snowflake OwnerID;
|
||||
|
||||
std::float_t radius = 0.f;
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ class Physics {
|
||||
std::unordered_map<std::string, std::shared_ptr<Model>>& models);
|
||||
static void invokeOnColisionEvent(
|
||||
gsl::not_null<utils::ThreadPool*> thread_pool,
|
||||
std::unordered_map<utils::Snowflake, Model>& models);
|
||||
std::unordered_map<utils::Snowflake, std::shared_ptr<Model>>& models);
|
||||
|
||||
bool RayTrace(const glm::vec3& rayOrigin, const glm::vec3& rayDir,
|
||||
const glm::vec3& v0, const glm::vec3& v1, const glm::vec3& v2,
|
||||
|
||||
Reference in New Issue
Block a user