collision causes basic terrain manipulation (at collision volume llf …

…currently...) #92
lanice · Feb 17, 2014 · ba3186a · ba3186a
1 parent b1e40b4
commit ba3186a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/libelemate/particles/particlecollision.cpp b/libelemate/particles/particlecollision.cpp
@@ -8,6 +8,7 @@
 #include "particlescriptaccess.h"
 #include "particlegroup.h"
 #include "lua/luawrapper.h"
+#include "terrain/terraininteraction.h"
 
 std::list<ParticleCollision::IntersectionBox> ParticleCollision::debug_intersectionBoxes;
 
@@ -33,16 +34,19 @@ void extractPointsInside(const std::vector<vec3> & points, const AxisAlignedBoun
 ParticleCollision::ParticleCollision(ParticleScriptAccess & psa)
 : m_psa(psa)
 , m_lua(new LuaWrapper())
+, m_terrainInteraction(new TerrainInteraction("bedrock"))
 {
     m_lua->loadScript("scripts/collision.lua");
     m_psa.registerLuaFunctions(*m_lua);
+    m_terrainInteraction->registerLuaFunctions(*m_lua);
 
     registerLuaFunctions();
 }
 
 ParticleCollision::~ParticleCollision()
 {
     delete m_lua;
+    delete m_terrainInteraction;
 }
 
 void ParticleCollision::registerLuaFunctions()

diff --git a/libelemate/particles/particlecollision.h b/libelemate/particles/particlecollision.h
@@ -14,6 +14,7 @@ namespace glowutils {
 class ParticleScriptAccess;
 class ParticleGroup;
 class LuaWrapper;
+class TerrainInteraction;
 
 class ParticleCollision
 {
@@ -34,6 +35,7 @@ class ParticleCollision
 protected:
     ParticleScriptAccess & m_psa;
     LuaWrapper * m_lua;
+    TerrainInteraction * m_terrainInteraction;
 
     /** Register my functions that can be called from lua.
       * If a relevant collision occurs, this class will call elementReaction() in lua. Lua functions called on this class

diff --git a/libelemate/terrain/terraininteraction.cpp b/libelemate/terrain/terraininteraction.cpp
@@ -300,5 +300,5 @@ void TerrainInteraction::registerLuaFunctions(LuaWrapper & lua)
     lua.Register("terrain_gatherElement", func4);
     lua.Register("terrain_terrainHeightAt", func5);
     lua.Register("terrain_heightGrab", func6);
-    lua.Register("setInteractElement", func7);
+    lua.Register("terrain_setInteractElement", func7);
 }
diff --git a/scripts/collision.lua b/scripts/collision.lua
@@ -49,6 +49,8 @@ function collisionWaterLava(waterGroup, lavaGroup)
     -- and later.. check that ratio between the two particles types, the release functions return a number of particles
     -- now create bedrock where lava was removed
     pc_createFromRemembered("bedrock")
+    terrain_setInteractElement("bedrock");
+    terrain_dropElement(collisionLlf[1], collisionLlf[3], 0.2);
 end
 
 function enlargeBox(llf, urb, delta)