diff options
Diffstat (limited to 'src/3d/object.h')
| -rw-r--r-- | src/3d/object.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3d/object.h b/src/3d/object.h index c2d9ba1..dcd96e3 100644 --- a/src/3d/object.h +++ b/src/3d/object.h @@ -4,8 +4,8 @@ #pragma once -#include "util/mini_math.h" #include "util/asset_manager_dcl.h" +#include "util/mini_math.h" enum class ObjectType { CUBE, @@ -41,12 +41,12 @@ class Object3D { AssetId mesh_asset_id; vec3 local_extent; // Half-extents for AABB (used by meshes for shadows) - void* user_data; // For tool-specific data, not for general use + void* user_data; // For tool-specific data, not for general use Object3D(ObjectType t = ObjectType::CUBE) : position(0, 0, 0), rotation(0, 0, 0, 1), scale(1, 1, 1), type(t), color(1, 1, 1, 1), velocity(0, 0, 0), mass(1.0f), restitution(0.5f), - is_static(false), mesh_asset_id((AssetId)0), local_extent(1, 1, 1), + is_static(false), mesh_asset_id((AssetId)0), local_extent(1, 1, 1), user_data(nullptr) { } |