From 1f38730c969641e8cf43f493c293b56b03b8ca0e Mon Sep 17 00:00:00 2001
From: Ethan Adams <ethan.adams@live.ca>
Date: Tue, 25 Jun 2024 15:40:17 -0400
Subject: [PATCH] Added normal parameter for easier knockback implemention
 script-side Moved scripts to more descriptive location

---
 Resources/scenes/debugScene.xml               |   6 ++--
 Resources/scripts/.grunt_behaviour.lua.swp    | Bin 12288 -> 0 bytes
 .../scripts/{ => ai}/grunt_behaviour.lua      |   0
 .../scripts/{ => ai}/scared_behaviour.lua     |   0
 .../scripts/{ => weapons}/shotgun_script.lua  |  16 +++++----
 Resources/weapons/bubblegun.xml               |   2 +-
 .../include/gameplay/weapons/weapon.h         |   3 +-
 YuppleMayham/include/utility/events.h         |   5 ++-
 YuppleMayham/src/gameplay/physics.cpp         |  10 +++---
 YuppleMayham/src/gameplay/scene.cpp           |   3 +-
 YuppleMayham/src/gameplay/weapons/weapon.cpp  |   4 +--
 YuppleMayham/src/utility/script.cpp           |  33 ++++++++++++++++--
 12 files changed, 61 insertions(+), 21 deletions(-)
 delete mode 100644 Resources/scripts/.grunt_behaviour.lua.swp
 rename Resources/scripts/{ => ai}/grunt_behaviour.lua (100%)
 rename Resources/scripts/{ => ai}/scared_behaviour.lua (100%)
 rename Resources/scripts/{ => weapons}/shotgun_script.lua (52%)

diff --git a/Resources/scenes/debugScene.xml b/Resources/scenes/debugScene.xml
index 456c249..62da31c 100644
--- a/Resources/scenes/debugScene.xml
+++ b/Resources/scenes/debugScene.xml
@@ -39,15 +39,15 @@
     </player>
     <entity x="10" y="3" weapon="pistolGun">
       <sprite file="sprites/player3Atlas.png" frameSize="64.0" directional="true"/>
-      <script file="scripts/grunt_behaviour.lua"/>
+      <script file="scripts/ai/grunt_behaviour.lua"/>
     </entity>
     <entity x="6" y="3" weapon="pistolGun">
       <sprite file="sprites/player2Atlas.png" frameSize="128.0"/>
-      <script file="scripts/grunt_behaviour.lua"/>
+      <script file="scripts/ai/grunt_behaviour.lua"/>
     </entity>
     <entity x="5" y="3" weapon="pistolGun">
       <sprite file="sprites/player2Atlas.png" frameSize="128.0"/>
-      <script file="scripts/grunt_behaviour.lua"/>
+      <script file="scripts/ai/grunt_behaviour.lua"/>
     </entity>
   </entities>
 </scene>
diff --git a/Resources/scripts/.grunt_behaviour.lua.swp b/Resources/scripts/.grunt_behaviour.lua.swp
deleted file mode 100644
index df4958823bb4f4290f7ba009ce0a4d0910bfbfd9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2OKclO7{{kodAQJmfIDAP1di~o9fzt(R98x0D6~~eo3=t!RAYPWU9{dcv*S1}
z0?u42!J!BtIPy63z>y;y5C{n*IB`J;PFxV2N+nSF&&;mv*hz~75>ho*e)VQ%cIKP^
z_n1|)^~(8`leFm1F?=3m?21q=efh{y#*V6h$NHDse2yGFdwliOX>We<(CXop>XxGq
zFO|=wLZ)RiaXC$TvLVV+bd$9FT(8@W#7RB~c&B_u*uJ!!He}dUX}K+XvAR?j0bdJo
zn;-S~mdm&fr+`ynQh}aoc?-MQe08p}cV-Vg{Ls0{5$<=VfK$LJ;1qBQI0c*nP64NY
zQ{WC)Ky|mVo7m%a@I2U-fiL%Q3OEIv0!{&^fK$LJ;1qBQI0c*nP64NYQ{WC!fHxUC
zzJsx^?!t!f_kaC=0KY%L*r(uQ@GiIvE`oz#2K=>~u^ZqI@FRE!yald;%it2Ig2%w4
zU?=!<7si9@;5+awcmphgUEsI-8T%f51YQFTZ~{CH7Qha`z|H#@`w+YiBsc_Wpa8Dz
zWbA#g1b!_r_5pYXc;IpH<-Lr30^S2}gA`l<2f$vi6Kn^++{4&U;A`+XxCX9*D_{*I
z;37B=o&^WM0@x3(-;I5M&%m4DMIb;G+<?YEgCD>*Kx_U5a380DQ@|<kuM`kM#7$P<
z4VB2HG)NLvoMi>mmNj;gHE}GFeJ-22D{N6SOcjqCqG;~&@g7#F!Xz${;<7E&uwj-C
z(tM>tDiAR%cwSeAu`14(yC_VFM?xy%ie||7Y2#%6`p}F%SB>CwwuoJGdMQ1BAzQ$j
zVOGfIo-oWzj*VmkU#(FbM%K($FK+0~SmQRXHp@Iuk0KsYz*A}^y|`%_x)C1;39ABZ
z3qSn;yBbb~h6ax!firVV><L}1<o4f!?mHn`ifW`}Pq0EEb4kHE#g~cV#>^TmR!n!4
znqkxZrW>2>bx+A7Nk67qjppoTF)MB(egD{sEuPJl88ba)b^mSFoLji%s<39Xp50<@
z(8x;aa25EH$IYZutlG$ve9+*j5^_n$;4ztWE<o7gEFGZvYzAvI4}HX_5)g2C<*dH)
zmvyvZtDcv+JqXnv6VIbr>r$j5#=C@P>_Sr!Zi6&ee>x1cxY}cxF`j45@w}}K@;t~f
zGNCJEE0O=50ko=Pa^tKULNf^4K{U`w-M}l7ye+7y?N2C;l0G#NF*>(Q(&vJgbkf!n
zMGYxz7>>KcBpwnYj9XzG!UwG=!T2>E^@MNcny^L+)srz22N|ig)8ELlOcR2iQqz$6
zEw48eqIg6p3>Db`6d%OKaCdqwqrWZ<T*)LlB2pE`dFH%K>$UM9d#Y0LD<#^$4_~t-
z8r-V$at(v%6}?0j&8taXEvD9*od}DeQMMpv`+}SDT4-B_h4i1)E4yfJf}Ow=tQDml
z(n(UN)$PgzMN%gQ9Ng`pDISo$H45W44PTXo_b|fLvtb=eTBJh+g~ryg>53jU%`Evg
zHYw?*Y14ydyr$Xuu}RLHHg43a7yh4P0Xxjjy*&9dk)KEjr^X=ZX=R&QI;arF8zuDh
z39^dVUS6So7)8*V(k}1ELZ=Jq$>FJ{C=tRMaiyp0^H}BH(rKad&N#=q&5WmPUKI1(
zTL>m;PO6bhM_u+fvgQeD^A21J%MRr)O4G6I7|c&Dy|?9+%<nc|DLW^uM>jpqvVryp
z!*;fOa6n4y8otjyE8sxd)VX>T%Qs<8kg=T8eKst!RZV86FG*D_noC|!i`-u)kLt*$
z7pk-LB#rkBOwT~~jIA;<xkUARg^i~G&KR>mQ?!fu$$;Z3zs$Qio|%e+66pt<bu?l(
z#+u0_VTD1~t1X)79gOzBwM6h_AR-jmQ82L4d2632Z17Ci!+o{}4r<v&Ugt1pJ4)(2
JLLHYW`y17)z+(Ua

diff --git a/Resources/scripts/grunt_behaviour.lua b/Resources/scripts/ai/grunt_behaviour.lua
similarity index 100%
rename from Resources/scripts/grunt_behaviour.lua
rename to Resources/scripts/ai/grunt_behaviour.lua
diff --git a/Resources/scripts/scared_behaviour.lua b/Resources/scripts/ai/scared_behaviour.lua
similarity index 100%
rename from Resources/scripts/scared_behaviour.lua
rename to Resources/scripts/ai/scared_behaviour.lua
diff --git a/Resources/scripts/shotgun_script.lua b/Resources/scripts/weapons/shotgun_script.lua
similarity index 52%
rename from Resources/scripts/shotgun_script.lua
rename to Resources/scripts/weapons/shotgun_script.lua
index 4c8e4b6..f2f45aa 100644
--- a/Resources/scripts/shotgun_script.lua
+++ b/Resources/scripts/weapons/shotgun_script.lua
@@ -1,17 +1,21 @@
+
+function length(vec)
+	return math.sqrt(vec.x^2 + vec.y^2)
+end
+
 -- How bullets are produced make sure to generate bullet data, then pass it through createBullet
 function onShoot() 
 	rot = weapon.wielder.rotation
 	data = weapon:genBulletData()
-	for i=1, 10 do
-		spread = math.random(-20, 20)
-		print("direction x: "..data.direction.x.." y: "..data.direction.y);
+	for i=-20, 20, 10 do
+		spread = i
 		data.direction.x = math.cos(math.rad(rot + spread))
 		data.direction.y = math.sin(math.rad(rot + spread))
 		weapon:createBullet(data)
 	end
 end
 
--- How the bulllet, target or wielder respond when the bullet hits a target.
-function onHit(target)
-
+-- How the bullet, target or wielder respond when the bullet hits a target.
+function onHit(target, bullet, normal)
+	target.physics.rigidBody:applyForce(vec3.new(normal.x, normal.y, 0.0), 5000.0);
 end
diff --git a/Resources/weapons/bubblegun.xml b/Resources/weapons/bubblegun.xml
index 96ab369..ff0536d 100644
--- a/Resources/weapons/bubblegun.xml
+++ b/Resources/weapons/bubblegun.xml
@@ -12,7 +12,7 @@
   </weapon>
 
   <weapon name="shotGun" fireSpeed="750.0">
-    <script file="scripts/shotgun_script.lua"/>
+    <script file="scripts/weapons/shotgun_script.lua"/>
     <sprite file="sprites/machineGunAtlas256.png" animated="true" frameSize="256.0">
       <size x="55.0" y="55.0"/>
       <offset x="-30.0" y="0.0"/>
diff --git a/YuppleMayham/include/gameplay/weapons/weapon.h b/YuppleMayham/include/gameplay/weapons/weapon.h
index ec4befd..800690a 100644
--- a/YuppleMayham/include/gameplay/weapons/weapon.h
+++ b/YuppleMayham/include/gameplay/weapons/weapon.h
@@ -21,6 +21,7 @@ class EventManager;
 class ResourceManager;
 class GameActor;
 class WeaponScript;
+struct PhysicsComponent;
 struct WeaponData;
 
 class Weapon : public Entity, public std::enable_shared_from_this<Weapon>
@@ -45,7 +46,7 @@ public:
 		float speedMod;
 		float dropMod;
 	};
-	void onHitCallback(std::shared_ptr<GameActor> target);
+	void onHitCallback(std::shared_ptr<GameActor> target, std::shared_ptr<PhysicsComponent> bullet, const glm::vec2& normal);
 
 	glm::vec2					getWeaponSize()		const { return weaponSize; }
 	// This is the offset from the center right point of the weapon to the barrel of the gun defined in 
diff --git a/YuppleMayham/include/utility/events.h b/YuppleMayham/include/utility/events.h
index d36431a..c33811c 100644
--- a/YuppleMayham/include/utility/events.h
+++ b/YuppleMayham/include/utility/events.h
@@ -33,10 +33,13 @@ public:
 
 class BulletCollideEvent : public Event {
 public:
-	BulletCollideEvent(const unsigned int ownerID, const unsigned int victimID) : ownerID(ownerID), victimID(victimID) {}
+	BulletCollideEvent(const unsigned int ownerID, const unsigned int victimID, const std::shared_ptr<PhysicsComponent>& bullet, const glm::vec2& normal) 
+		: ownerID(ownerID), victimID(victimID), bullet(bullet), normal(normal){}
 	std::string getType() const override { return "OnBulletCollide"; }
 	unsigned int ownerID;
 	unsigned int victimID;
+	std::shared_ptr<PhysicsComponent> bullet;
+	glm::vec2 normal;
 };
 
 class DirectionChangeEvent : public Event {
diff --git a/YuppleMayham/src/gameplay/physics.cpp b/YuppleMayham/src/gameplay/physics.cpp
index 11a44eb..61c4898 100644
--- a/YuppleMayham/src/gameplay/physics.cpp
+++ b/YuppleMayham/src/gameplay/physics.cpp
@@ -101,16 +101,18 @@ void PhysicsEngine::resolvePossibleCollisions()
 		if (glm::length(distance) < sumOfRadius)
 		{
 			// We got impact!
+			glm::vec3 normal = distance / glm::length(distance);
 			// That impact is a bullet hitting a gameactor!
-			if (objs.first->isBullet || objs.second->isBullet && !(objs.first->isBullet && objs.second->isBullet))
+			if ((objs.first->isBullet || objs.second->isBullet) && !(objs.first->isBullet && objs.second->isBullet))
 			{
 				eventManager->notify(std::make_shared<BulletCollideEvent>(
-					(objs.first->isBullet)  ? objs.first->ID : objs.second->ID,
-					(!objs.first->isBullet) ? objs.first->ID : objs.second->ID
+					( objs.first->isBullet) ? objs.first->ID : objs.second->ID,
+					(!objs.first->isBullet) ? objs.first->ID : objs.second->ID,
+					std::make_shared<PhysicsComponent>(( objs.first->isBullet) ? objs.first : objs.second),
+					normal
 				));
 			}
 			// Apply impulse force
-			glm::vec3 normal = distance / glm::length(distance);
 			float penetrationDepth = sumOfRadius - glm::length(distance);
 			glm::vec3 correctionVector = normal * (penetrationDepth / ((1 / objs.first->rigidBody.mass) + (1 / objs.second->rigidBody.mass)));
 			glm::vec3 vrel = objs.first->rigidBody.velocity - objs.second->rigidBody.velocity;
diff --git a/YuppleMayham/src/gameplay/scene.cpp b/YuppleMayham/src/gameplay/scene.cpp
index deaa18f..8cf63d1 100644
--- a/YuppleMayham/src/gameplay/scene.cpp
+++ b/YuppleMayham/src/gameplay/scene.cpp
@@ -31,6 +31,7 @@ Scene::Scene(SceneType sceneType, std::shared_ptr<ResourceManager> resources) :
 	physicsEngine = std::make_shared<PhysicsEngine>();
 	eventManager = std::make_shared<EventManager>();
 	physicsEngine->hookEventManager(eventManager);
+	hookSceneEvents();
 	if (sceneType == SCENE_SHOOTER)
 		loadDebugShooterScene();
 }
@@ -150,7 +151,7 @@ void Scene::hookSceneEvents()
 		std::shared_ptr<GameActor> shooter = getGameActorByID(collideEvent->ownerID);
 		std::shared_ptr<GameActor> target  = getGameActorByID(collideEvent->victimID);
 		if (shooter && target)
-			shooter->getHeldWeapon()->onHitCallback(target);
+			shooter->getHeldWeapon()->onHitCallback(target, collideEvent->bullet, collideEvent->normal);
 	});
 }
 
diff --git a/YuppleMayham/src/gameplay/weapons/weapon.cpp b/YuppleMayham/src/gameplay/weapons/weapon.cpp
index 96d6f9c..e69d741 100644
--- a/YuppleMayham/src/gameplay/weapons/weapon.cpp
+++ b/YuppleMayham/src/gameplay/weapons/weapon.cpp
@@ -86,11 +86,11 @@ void Weapon::attachScript(const std::shared_ptr<WeaponScript>& script)
 	std::cout << "weapon state bound" << std::endl;
 }
 
-void Weapon::onHitCallback(std::shared_ptr<GameActor> target)
+void Weapon::onHitCallback(std::shared_ptr<GameActor> target, std::shared_ptr<PhysicsComponent> bullet, const glm::vec2& normal)
 {
 	if (weaponScript && weaponScript->lua["onHit"].valid())
 	{
-		auto result = weaponScript->lua["onHit"](target);
+		auto result = weaponScript->lua["onHit"](target, bullet, normal);
 		if (!result.valid())
 		{
 			sol::error err = result;
diff --git a/YuppleMayham/src/utility/script.cpp b/YuppleMayham/src/utility/script.cpp
index 0975d53..a162a7f 100644
--- a/YuppleMayham/src/utility/script.cpp
+++ b/YuppleMayham/src/utility/script.cpp
@@ -7,31 +7,60 @@
 
 void Script::registerGlobalUserTypes()
 {
+	auto vec3_mult_overloads = sol::overload(
+		[](const glm::vec3& v1, const glm::vec3& v2)	-> glm::vec3 {return v1 * v2; },
+		[](const glm::vec3& v1, const float f)			-> glm::vec3 { return v1 * f; },
+		[](const float f, const glm::vec3& v1)			-> glm::vec3 { return f * v1; }
+	);
+
+	auto vec2_mult_overloads = sol::overload(
+		[](const glm::vec2& v1, const glm::vec2& v2)	-> glm::vec2 { return v1 * v2; },
+		[](const glm::vec2& v1, const float f)			-> glm::vec2 { return v1 * f; },
+		[](const float f, const glm::vec3& v1)			-> glm::vec2 { return f * v1; }
+	);
+
+	auto vec3_div_overloads = sol::overload(
+		[](const glm::vec3& v1, const glm::vec3& v2)	-> glm::vec3 {return v1 / v2; },
+		[](const glm::vec3& v1, const float f)			-> glm::vec3 { return v1 / f; },
+		[](const float f, const glm::vec3& v1)			-> glm::vec3 { return f / v1; }
+	);
+
+	auto vec2_div_overloads = sol::overload(
+		[](const glm::vec2& v1, const glm::vec2& v2)	-> glm::vec2 { return v1 / v2; },
+		[](const glm::vec2& v1, const float f)			-> glm::vec2 { return v1 / f; },
+		[](const float f, const glm::vec3& v1)			-> glm::vec2 { return f / v1; }
+	);
+
 	// These usertypes are constant for every script
 	lua.new_usertype<glm::vec3>("vec3",
 		sol::constructors<glm::vec3(), glm::vec3(float, float, float)>(),
+		sol::meta_function::multiplication, vec3_mult_overloads,
+		sol::meta_function::division, vec3_div_overloads,
 		"x", &glm::vec3::x,
 		"y", &glm::vec3::y,
 		"z", &glm::vec3::z);
 	lua.new_usertype<glm::vec2>("vec2",
 		sol::constructors<glm::vec2(), glm::vec2(float, float)>(),
+		sol::meta_function::multiplication, vec2_mult_overloads,
+		sol::meta_function::division, vec2_div_overloads,
 		"x", &glm::vec2::x,
 		"y", &glm::vec2::y);
 	lua.new_usertype<GameActor>("GameActor",
 		// properties
 		"position", sol::property(&GameActor::getCenter, &GameActor::setPosition),
 		"rotation", sol::property(&GameActor::getRotation, &GameActor::setRotation),
+		"physics",  sol::property(&GameActor::getPhysicsComponent),
 		// methods
 		"moveUp", &GameActor::moveUp,
 		"moveDown", &GameActor::moveDown,
 		"moveLeft", &GameActor::moveLeft,
 		"moveRight", &GameActor::moveRight,
 		"moveForward", &GameActor::moveForward,
-		"shoot", &GameActor::fireWeapon,
-		"physics", &GameActor::getPhysicsComponent);
+		"shoot", &GameActor::fireWeapon);
 	lua.new_usertype<PhysicsComponent>("PhysicsComponent",
 		"rigidBody", &PhysicsComponent::rigidBody);
 	lua.new_usertype<PhysicsComponent::RigidBody>("RigidBody",
+		"position", &PhysicsComponent::RigidBody::position,
 		"mass", &PhysicsComponent::RigidBody::mass,
 		"veloctiy", &PhysicsComponent::RigidBody::velocity,
 		"applyForce", &PhysicsComponent::RigidBody::applyForce);