View difference between Paste ID: G1pqMasQ and iCzJdCun

 /////////////////////////////////////////////////////////////////////////////////////////////////////////
 // RpgMakerPlugin
-// Message.cpp
+// Movement.cpp
 //
-// Code : Giuseppe Alfieri
+// Code : Giuseppe Alfieri (thanks Anael Seghezzi)
 //
-// need to review something about collisions, it doesn't work like I expected and cannot figure out how to fix this.
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "Message.h"
+#include "Movement.h"
 
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Init, this part is always similar, constructor, copy constructor etc
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
-Message::Message(MObject3d * parentObject):
+
 // constructor
-text()
+Movement::Movement(MObject3d * parentObject):
 MBehavior(parentObject),
 animated(1),
 m_rotationSpeed(1),
-Message::Message(Message & behavior, MObject3d * parentObject):
+autoRotate(0),
 m_speed(0),
-text(behavior.text)
+m_flySpeed(0),
 m_pattern(),
 cycle(0)
 {}
-Message::~Message(void)
+
 // copy constructor
 Movement::Movement(Movement & behavior, MObject3d * parentObject):
 MBehavior(parentObject),
-void Message::destroy(void)
+animated(behavior.animated),
 m_rotationSpeed(behavior.m_rotationSpeed),
 autoRotate(0),
 m_speed(behavior.m_speed),
 m_flySpeed(behavior.m_flySpeed),
 m_pattern(behavior.m_pattern),
-MBehavior * Message::getNew(MObject3d * parentObject)
+cycle(behavior.cycle)
 {}
-	return new Message(parentObject);
+
 // destructor
 Movement::~Movement(void)
 {}
-MBehavior * Message::getCopy(MObject3d * parentObject)
+
 // destroy function : always similar
-	return new Message(*this, parentObject);
+void Movement::destroy(void)
 {
 	delete this;
 }
 
 // getNew function : always similar
 MBehavior * Movement::getNew(MObject3d * parentObject)
 {
-unsigned int Message::getVariablesNumber(void){
+	return new Movement(parentObject);
-	return 1;
+
 
 // getCopy function : always similar
-MVariable Message::getVariable(unsigned int id)
+MBehavior * Movement::getCopy(MObject3d * parentObject)
 {
 	return new Movement(*this, parentObject);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Variables, allow to access custom variable from script and from Maratis Editor
-		return MVariable("MessageText", &text, M_VARIABLE_STRING);
+
 int i=0;
 unsigned int Movement::getVariablesNumber(void){
 	return 7;
 }
 
 MVariable Movement::getVariable(unsigned int id)
 {
 	switch(id)
 	{
-void Message::update(void)
+
 		return MVariable("NULL", NULL, M_VARIABLE_NULL);
 	case 0:
 		return MVariable("animated", &animated, M_VARIABLE_BOOL);
 	case 1:
 		return MVariable("rotationSpeed", &m_rotationSpeed, M_VARIABLE_FLOAT);
 	case 2:
 		return MVariable("autoRotate", &autoRotate, M_VARIABLE_BOOL);
 	case 3:
-	unsigned int objid=0,playerid=0;
+		return MVariable("movementSpeed", &m_speed, M_VARIABLE_FLOAT);
 	case 4:
 		return MVariable("flySpeed", &m_flySpeed, M_VARIABLE_FLOAT);
-	// get the actual scene
+	case 5:
-	MScene* nScene=engine->getLevel()->getCurrentScene();
+		return MVariable("movementPattern", &m_pattern, M_VARIABLE_STRING);
-	// get from the actual scene the object Index to be used for function isObjectsCollision in MPhysicsContext
+	case 6:
-	nScene->getObjectIndex("select", &playerid);
+		return MVariable("CycleMovement", &cycle, M_VARIABLE_BOOL);
-	nScene->getObjectIndex(parent->getName(), &objid);
+
-	// istanciate MPhysicsContext state
+
-	MPhysicsContext * state = engine->getPhysicsContext();
+
 
-	int coll=state->isObjectsCollision(playerid,objid);
+
-	//if collision happened between selector and parent object and action key is pressed does something
+
-	if(coll){
+
-		if(MInputContext* input = engine->getInputContext()){
+
-			if(input->isKeyPressed("E")){
+
-                       printf("%s",&text);
+
 void Movement::update(void)
-               }
+
 	MEngine * engine = MEngine::getInstance();
 	MGame * game = engine->getGame();
 
 	// check if the game is running, removing thif test will enable In-Editor update (like for the lookAt behavior)
 	if(! game->isRunning())
 		return;
 
 	// get the associated parent object (who is using this behavior)
 	MObject3d * parent = getParentObject();
 
 	// lets rotate the parent object around the z axis, using our custom "rotationSpeed" variable
 	if(animated){
 	if(autoRotate)
 	parent->addAxisAngleRotation(MVector3(0, 0, 1), m_rotationSpeed);
 	if(i<strlen(m_pattern)){
 	// a pattern string of wasd moves the object using rotationSpeed and moveSpeed
 	if(m_pattern[i]=='w'){
 	MVector3 axis = parent->getRotatedVector(MVector3(0,m_speed,0));
 	parent->setPosition(parent->getPosition() + axis);
 	}
 	if(m_pattern[i]=='a'){
 		parent->addAxisAngleRotation(parent->getInverseRotatedVector(MVector3(0, 0, 0.5)), m_rotationSpeed);
 	}
 	if(m_pattern[i]=='d'){
 		parent->addAxisAngleRotation(parent->getInverseRotatedVector(MVector3(0, 0, 0.5)), -m_rotationSpeed);
 	}
 	if(m_pattern[i]=='s'){
 		MVector3 axis = parent->getRotatedVector(MVector3(0,-m_speed,0));
 		parent->setPosition(parent->getPosition() + axis);
 	}
 	i++;
 	}
 	else if(cycle)
 		i=0;
 
 	}
 }