From 868ba6279a20e4d1412c2d576c67400167de6694 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Tue, 30 Apr 2019 16:12:35 +0500
Subject: Integrated Optick profiler

---
 src/World.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/World.cpp')

diff --git a/src/World.cpp b/src/World.cpp
index da0a33b..fa281f1 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -2,6 +2,7 @@
 
 #include <bitset>
 #include <glm/glm.hpp>
+#include <optick.h>
 
 #include "Event.hpp"
 #include "DebugInfo.hpp"
@@ -131,6 +132,7 @@ const Section &World::GetSection(Vector sectionPos) const {
 
 // TODO: skip liquid blocks
 RaycastResult World::Raycast(glm::vec3 position, glm::vec3 direction) const {
+	OPTICK_EVENT();
     const float maxLen = 5.0;
     const float step = 0.01;
 	glm::vec3 pos = glm::vec3(0.0);
@@ -150,6 +152,7 @@ RaycastResult World::Raycast(glm::vec3 position, glm::vec3 direction) const {
 }
 
 void World::UpdatePhysics(float delta) {
+	OPTICK_EVENT();
     struct CollisionResult {
         bool isCollide;
         //Vector block;
@@ -158,6 +161,7 @@ void World::UpdatePhysics(float delta) {
     };
 
     auto testCollision = [this](double width, double height, VectorF pos)->CollisionResult {
+		OPTICK_EVENT("testCollision");
         int blockXBegin = pos.x - width - 1.0;
         int blockXEnd = pos.x + width + 0.5;
         int blockYBegin = pos.y - 0.5;
@@ -177,6 +181,7 @@ void World::UpdatePhysics(float delta) {
         for (int y = blockYBegin; y <= blockYEnd; y++) {
             for (int z = blockZBegin; z <= blockZEnd; z++) {
                 for (int x = blockXBegin; x <= blockXEnd; x++) {
+					OPTICK_EVENT("testCollision");
                     BlockId block = this->GetBlockId(Vector(x, y, z));
                     if (block.id == 0 || block.id == 31 || block.id == 37 || block.id == 38 || block.id == 175 || block.id == 78)
                         continue;
@@ -191,6 +196,7 @@ void World::UpdatePhysics(float delta) {
     };
 
     for (auto& it : entities) {
+		OPTICK_EVENT("Foreach entities");
 		if (it.isFlying) {
 			VectorF newPos = it.pos + VectorF(it.vel.x, it.vel.y, it.vel.z) * delta;
 			auto coll = testCollision(it.width, it.height, newPos);
-- 
cgit v1.2.3


From 646f77ec6bc27af231b6ff8974e631b86188beb6 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Sun, 19 May 2019 23:03:48 +0500
Subject: Implemented block-api

---
 src/World.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/World.cpp')

diff --git a/src/World.cpp b/src/World.cpp
index fa281f1..00a1a19 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -98,7 +98,7 @@ bool World::isPlayerCollides(double X, double Y, double Z) const {
             for (int y = 0; y < 16; y++) {
                 for (int z = 0; z < 16; z++) {
                     BlockId block = section.GetBlockId(Vector(x, y, z));
-                    if (block.id == 0 || block.id == 31 || block.id == 37 || block.id == 38 || block.id == 175)
+                    if (!GetBlockInfo(block).collides)
                         continue;
                     AABB blockColl{ (x + it.x * 16.0),
                         (y + it.y * 16.0),
@@ -183,8 +183,8 @@ void World::UpdatePhysics(float delta) {
                 for (int x = blockXBegin; x <= blockXEnd; x++) {
 					OPTICK_EVENT("testCollision");
                     BlockId block = this->GetBlockId(Vector(x, y, z));
-                    if (block.id == 0 || block.id == 31 || block.id == 37 || block.id == 38 || block.id == 175 || block.id == 78)
-                        continue;
+					if (block.id == 0 || !GetBlockInfo(block).collides)
+						continue;
                     AABB blockColl{ x,y,z,1.0,1.0,1.0 };
                     if (TestCollision(entityCollBox, blockColl)) {
                         return { true };
-- 
cgit v1.2.3