summaryrefslogtreecommitdiff
path: root/src/entities.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/entities.cpp')
-rw-r--r--src/entities.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/entities.cpp b/src/entities.cpp
index 0fa5cf2..75a506f 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -7,6 +7,8 @@
#include "physics.hpp"
#include "plugins.hpp"
#include "static-missing-texture.hpp"
+#include "vendor-cgltf-include.hpp"
+#include "vendor-stb-image-include.h"
#include "window.hpp"
#include <BulletCollision/CollisionShapes/btConvexHullShape.h>
@@ -40,7 +42,7 @@ Entity_Base *EntityType_CreateGenericInstance(EntityType *et, Entity_Base *level
Entity_Base *genericEntity = ECS_CreateGenericEntity();
ECS_CreateEntity(genericEntity, levelEnt);
- for (size_t i = 0; i < et->detailsCount; ++i) {
+ for (int64_t i = 0; i < et->detailsCount; ++i) {
auto &etd = et->details[i];
auto *compInst = ECS_CreateInstance(genericEntity, etd.grBinds);
@@ -135,7 +137,7 @@ void CalculateCombinedMemReqs(uint64_t memReqsCount, VkMemoryRequirements *memRe
combinedMemReqs.size = 0;
combinedMemReqs.alignment = memReqs[0].alignment;
combinedMemReqs.memoryTypeBits = memReqs[0].memoryTypeBits;
- for (long i = 1; i < memReqsCount; ++i) {
+ for (uint64_t i = 1; i < memReqsCount; ++i) {
combinedMemReqs.memoryTypeBits |= memReqs[i].memoryTypeBits;
if (combinedMemReqs.alignment == memReqs[i].alignment) {
continue;
@@ -158,7 +160,7 @@ void CalculateCombinedMemReqs(uint64_t memReqsCount, VkMemoryRequirements *memRe
}
combinedMemReqs.alignment = combined;
}
- for (long i = 0; i < memReqsCount; ++i) {
+ for (uint64_t i = 0; i < memReqsCount; ++i) {
uint32_t alignmentPadding = memReqs[i].size % combinedMemReqs.alignment;
memReqs[i].size += (alignmentPadding == 0 ? 0 : combinedMemReqs.alignment - alignmentPadding);
combinedMemReqs.size += memReqs[i].size;
@@ -1050,10 +1052,10 @@ void EntityType_Load(EntityType &et) {
assert(gltfData->buffers_count == 1);
// make sure cgltf can interpret our model
- for (long i = 0; i < gltfData->accessors_count; ++i) {
+ for (unsigned long i = 0; i < gltfData->accessors_count; ++i) {
assert(gltfData->accessors[i].type != cgltf_type_invalid);
}
- for (long i = 0; i < gltfData->buffers_count; ++i) {
+ for (unsigned long i = 0; i < gltfData->buffers_count; ++i) {
assert(gltfData->buffer_views[i].type != cgltf_buffer_view_type_invalid);
}
@@ -1226,6 +1228,7 @@ void EntityType_Unload(EntityType &et, CompGrBinds *grBindsArr[1]) {
}
void EntityType_Tick(double delta) {
+ (void)delta;
const auto count = EntitiesToBeRemoved.Count();
for (long i = 0; i < count; ++i) {
auto *entTypePtr = EntityType_FindByEntityHandle(EntitiesToBeRemoved[i]->handle);
@@ -1242,6 +1245,7 @@ void EntityType_Tick(double delta) {
}
void EntityType_Tick_Late(double delta) {
+ (void)delta;
while (EntitiesWithExcessInstances.Count() != 0) {
auto *entity = EntitiesWithExcessInstances.Pop();
auto *etPtr = EntityType_FindByEntityHandle(entity->handle);