BulletEngine

data/equipment/projectiles/gunbullet.ini

@@ -1,6 +1,7 @@
 [general]
 type=bullet
 voxelcluster=gunbullet.csv
+instanced=true
 lifetime=1.5
 speed=350.0
 spinning=10.0
@@ -9,4 +10,4 @@ emissiveness=0.4
 collisionFieldOfDamage=7.2
 
 [hitsound]
-name=data/sound/hit2.ogg
+name=data/sound/hit2.ogg

data/equipment/projectiles/hornet.ini

@@ -1,6 +1,7 @@
 [general]
 type=rocket
 voxelcluster=hornet.csv
+instanced=false
 lifetime=60
 scale=0.5
 collisionFieldOfDamage=inf
@@ -11,4 +12,4 @@ direction=0.0,0.0,1.0
 
 [explosionsound]
 name=data/sound/102733__sarge4267__explosion3.ogg
-attenuation=0.3
+attenuation=0.3

data/equipment/projectiles/ionbullet.ini

@@ -1,6 +1,7 @@
 [general]
 type=bullet
 voxelcluster=ionbullet.csv
+instanced=true
 lifetime=10
 speed=1000.0
 spinning=1000.0
@@ -9,4 +10,4 @@ emissiveness=1.0
 collisionFieldOfDamage=inf
 
 [hitsound]
-name=data/sound/hit2.ogg
+name=data/sound/hit2.ogg

data/equipment/projectiles/pulselaser_bullet.ini

@@ -1,11 +1,12 @@
 [general]
 type=bullet
+instanced=true
 voxelcluster=pulselaser_bullet.csv
 lifetime=1
 speed=500.0
 spinning=0.0
 scale=0.4
-emissiveness=0.4
+emissiveness=40
 collisionFieldOfDamage=7.2
 
 [hitsound]

data/equipment/projectiles/railgunbullet.ini

@@ -1,6 +1,7 @@
 [general]
 type=bullet
 voxelcluster=railgunbullet.csv
+instanced=true
 lifetime=1.5
 speed=350.0
 spinning=10.0
@@ -10,4 +11,4 @@ collisionFieldOfDamage=7.2
 
 [hitsound]
 name=data/sound/hit2.ogg
-volume=0.5
+volume=0.5

data/equipment/projectiles/snowball.ini

@@ -1,6 +1,7 @@
 [general]
 type=bullet
 voxelcluster=snowball.csv
+instanced=true
 lifetime=2
 speed=100.0
 spinning=10.0

data/shader/bulletengine/bullet.frag

@@ -0,0 +1,31 @@
+#version 330
+
+uniform float time;
+uniform float withBorder;
+
+layout(location = 0) out vec4 fragColor;
+layout(location = 1) out vec4 normalz;
+layout(location = 2) out vec4 emissiveness;
+
+in vec4 f_color;
+flat in vec3 f_normal;
+in float f_emissiveness;
+in vec3 f_modelposition;
+flat in float f_active;
+flat in float f_deathTime;
+
+vec4 voxelFragmentColor(vec3 color, float emissiveness, vec3 normal, vec3 positionInVoxel);
+vec4 voxelFragmentEmissiveness(vec3 color, float emissiveness);
+vec4 voxelFragmenNormalZ(vec3 normal);
+
+
+void main() {
+    if (f_active < 0.5 || f_deathTime <= time) {
+        discard;
+    }
+
+    fragColor = voxelFragmentColor(f_color.xyz, f_emissiveness, f_normal, f_modelposition);
+    emissiveness = voxelFragmentEmissiveness(f_color.xyz, f_emissiveness);
+    normalz = voxelFragmenNormalZ(f_normal);
+}
+

data/shader/bulletengine/bullet.vert

@@ -0,0 +1,57 @@
+#version 330
+
+// Input
+layout(location = 0) in vec3 v_vertex;
+layout(location = 1) in vec3 v_normal;
+
+layout(location = 2) in vec3 v_gridCell;
+layout(location = 3) in vec4 v_color;
+layout(location = 4) in float v_emissiveness;
+
+layout(location = 5) in vec3 v_originPosition;
+layout(location = 6) in vec3 v_originEulers;
+layout(location = 7) in vec3 v_directionalSpeed;
+layout(location = 8) in vec3 v_angularSpeed;
+layout(location = 9) in vec3 v_center;
+layout(location = 10) in float v_originTime;
+layout(location = 11) in float v_deathTime;
+layout(location = 12) in float v_active;
+
+
+// Output
+out vec4 f_color;
+flat out vec3 f_normal;
+out float f_emissiveness;
+out vec3 f_modelposition;
+flat out float f_active;
+flat out float f_deathTime;
+
+// Uniforms
+uniform mat4 viewProjection;
+uniform float time;
+uniform float scale;
+uniform float emissiveness;
+
+
+vec3 qtransform(vec4 q, vec3 v);
+vec4 quat(vec3 euler);
+
+void main() {
+    f_active = v_active;
+    f_deathTime = v_deathTime;
+
+    float deltaTime = time - v_originTime;
+
+    f_color = v_color;
+    f_normal = v_normal;
+    f_emissiveness = clamp(emissiveness + v_emissiveness, 0, 1);
+    f_modelposition = v_vertex;
+
+    vec3 bulletEulers = v_originEulers + v_angularSpeed * deltaTime * 0.01;
+    vec4 bulletOrientation = quat(bulletEulers);
+
+    vec3 bulletPosition = v_originPosition + v_directionalSpeed * deltaTime;
+
+    gl_Position = viewProjection * vec4(qtransform(bulletOrientation, v_vertex + v_gridCell - v_center) * scale + bulletPosition, 1.0f);
+}
+

data/worldobjects/banner.ini

@@ -1,3 +1,3 @@
 [general]
-type=worldobject
+type=other
 voxelcluster=banner.csv

data/worldobjects/cake.ini

@@ -1,5 +1,5 @@
 [general]
-type=worldobject
+type=other
 voxelcluster=cake.csv
 scale=3
 

data/worldobjects/idareyou.ini

@@ -1,3 +1,3 @@
 [general]
-type=worldobject
+type=other
 voxelcluster=idareyou.csv

data/worldobjects/missionstart.ini

@@ -1,3 +1,3 @@
 [general]
-type=worldobject
+type=other
 voxelcluster=missionstart.csv

src/ai/aitask.cpp

@@ -2,14 +2,11 @@
 
 
 AiTask::AiTask(BoardComputer* boardComputer):
-    m_handle(Handle<AiTask>(this)),
     m_boardComputer(boardComputer)
 {
 }
 
-AiTask::~AiTask() {
-    m_handle.invalidate();
-}
+AiTask::~AiTask() = default;
 
 BoardComputer* AiTask::boardComputer() {
     return m_boardComputer;
@@ -19,7 +16,3 @@ bool AiTask::isFinished() {
     return false;
 }
 
-Handle<AiTask>& AiTask::handle() {
-    return m_handle;
-}
-

src/ai/aitask.h

@@ -3,6 +3,7 @@
 #include "scripting/scriptable.h"
 
 #include "utils/handle/handle.h"
+#include "utils/handle/handleowner.h"
 
 
 class BoardComputer;
@@ -12,7 +13,7 @@ class WorldObject;
  *  Basic unit for AI. A Ship's Character can always execute only one task.
  */
 
-class AiTask : public Scriptable {
+class AiTask : public Scriptable, public HandleOwner {
 public:
     AiTask(BoardComputer* boardComputer);
     virtual ~AiTask();
@@ -22,11 +23,8 @@ class AiTask : public Scriptable {
     virtual void update(float deltaSec) = 0;
     virtual bool isFinished();
 
-    Handle<AiTask>& handle();
-
 
 protected:
-    Handle<AiTask> m_handle;
     BoardComputer* m_boardComputer;
 };
 

src/ai/basictasks/cruiserfighttask.cpp

@@ -34,7 +34,7 @@ void CruiserFightTask::update(float deltaSec) {
         }
 
         if (targetDistance() < m_maxRocketDistance) {
-            boardComputer()->shootRockets(m_primaryTarget->handle());
+            boardComputer()->shootRockets(m_primaryTarget);
         }
 
         if (anyTargetDistance() < m_maxFireDistance) {
@@ -76,7 +76,7 @@ void CruiserFightTask::updateState() {
 float CruiserFightTask::anyTargetDistance() {
     WorldObject* worldObject = boardComputer()->worldObject();
     WorldObject* closestTarget = WorldObjectGeometryHelper::closestObject(*worldObject, &m_targets);
-    
+
     if (closestTarget) {
         return glm::length(worldObject->transform().position() - closestTarget->transform().position())
             - worldObject->bounds().minimalGridSphere().radius() * worldObject->transform().scale()
@@ -89,4 +89,4 @@ float CruiserFightTask::anyTargetDistance() {
 void CruiserFightTask::setState(State newState) {
     m_stateChanged = true;
     m_state = newState;
-}
+}

src/ai/basictasks/directsuicidetask.cpp

@@ -10,19 +10,19 @@
 
 DirectSuicideTask::DirectSuicideTask(BoardComputer* boardComputer, WorldObject* target) :
     AiTask(boardComputer),
-    m_target(target ? target->handle() : Handle<WorldObject>(nullptr))
+    m_target(target ? target->handle<WorldObject>() : Handle<WorldObject>())
 {
 }
 
 void DirectSuicideTask::setTarget(WorldObject* target) {
-    m_target = (target ? target->handle() : Handle<WorldObject>(nullptr));
+    m_target = (target ? target->handle<WorldObject>() : Handle<WorldObject>());
 }
 
 void DirectSuicideTask::update(float deltaSec) {
     WorldObject* worldObject = boardComputer()->worldObject();
 
     if (m_target.valid()) {
-        glm::vec3 targetPoint = m_target->physics().projectedTransformIn(0.1f).position();
+        glm::vec3 targetPoint = m_target->physics().speed().moved(m_target->transform(), 0.1f).position();
         boardComputer()->rotateTo(targetPoint);
         glm::vec3 targetDirection = glm::inverse(worldObject->transform().orientation()) * (targetPoint - worldObject->transform().position());
         float angle = GeometryHelper::angleBetween(glm::vec3(0, 0, -1), targetDirection);

src/ai/basictasks/fighterfighttask.cpp

@@ -43,7 +43,7 @@ void FighterFightTask::update(float deltaSec) {
                 boardComputer()->rotateTo(m_primaryTarget->transform().position());
                 boardComputer()->moveTo(m_primaryTarget->transform().position());
                 if (angleToTarget() < 15.0f && targetDistance() < m_maxRocketDistance) {
-                    boardComputer()->shootRockets(m_primaryTarget->handle());
+                    boardComputer()->shootRockets(m_primaryTarget);
                 }
             }
             if (targetDistance() < m_maxFireDistance) {

src/ai/basictasks/fighttask.cpp

@@ -34,4 +34,5 @@ void FightTask::setTargets(const std::vector<Handle<WorldObject>>& targets) {
 
 bool FightTask::isFinished() {
     return m_task->isFinished();
-}
+}
+

src/ai/boardcomputer.cpp

@@ -33,7 +33,7 @@ const EngineState& BoardComputer::engineState() const {
 }
 
 void BoardComputer::moveTo(const glm::vec3& position, bool decelerate) {
-    glm::vec3 projectedPosition = m_worldObject->physics().projectedTransformIn(1.0f).position();
+    glm::vec3 projectedPosition = m_worldObject->physics().speed().moved(m_worldObject->transform(), 1.0f).position();
     glm::vec3 delta = position - projectedPosition;
     float distance = glm::length(delta);
 
@@ -64,7 +64,7 @@ void BoardComputer::rotateTo(const glm::vec3& position, const glm::vec3& up) {
     glm::vec3 accumulatedEuler;
 
     // A guess (hack) where the WorldObject will point to in one second, in the local coordinate-sys
-    glm::quat projectedOrientation = glm::inverse(m_worldObject->transform().orientation()) * m_worldObject->physics().projectedTransformIn(0.1f).orientation();
+    glm::quat projectedOrientation = glm::inverse(m_worldObject->transform().orientation()) * m_worldObject->physics().speed().moved(m_worldObject->transform(), 0.1f).orientation();
     glm::vec3 projectedDirection = projectedOrientation * glm::vec3(0, 0, -1);
 
     // Direction to the target, in the local coordinate-sys
@@ -135,10 +135,8 @@ void BoardComputer::shootBullet(const std::vector<Handle<WorldObject>>& targets)
     }
 }
 
-void BoardComputer::shootRockets(Handle<WorldObject>& target) {
-    if (target.valid()) {
-        m_worldObject->components().fireAtObject(target.get());
-    }
+void BoardComputer::shootRockets(WorldObject* target) {
+    m_worldObject->components().fireAtObject(target);
 }
 
 void BoardComputer::update(float deltaSec) {

src/ai/boardcomputer.h

@@ -28,7 +28,7 @@ class BoardComputer {
     void rotateTo(const glm::vec3& position, const glm::vec3& up = glm::vec3(0, 0, 0));
 
     void shootBullet(const std::vector<Handle<WorldObject>>& targets);
-    void shootRockets(Handle<WorldObject>& target);
+    void shootRockets(WorldObject* target);
 
     void update(float deltaSec);
 

src/ai/grouptasks/defendareatask.cpp

@@ -77,7 +77,7 @@ bool DefendAreaTask::isEnemyInRange() {
         if (ship) {
             Faction& enemyFaction = ship->character()->faction();
             if (enemyFaction.relationTo(m_squad.leader()->character()->faction()).type() == FactionRelationType::Enemy) {
-                m_enemies.push_back(worldObject->handle());
+                m_enemies.push_back(worldObject->handle<WorldObject>());
             } else {
                 continue;
             }