devZoGok/PlanetFleet
1
0
Fork 0
mirror of https://github.com/devZoGok/PlanetFleet.git synced 2026-08-26 19:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved offset FX handling

Browse Source
This commit is contained in:
devZoGok
2024-06-21 20:01:16 +03:00
parent d6ef429d69
commit 3ccddb2a16
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit.cpp
+4 -7
View File
@@ -93,7 +93,7 @@ namespace battleship{
sol::table compTbl = fxTbl[i + 1];
bool vfx = compTbl["vfx"];
s64 duration = compTbl["duration"];
s64 duration = compTbl["duration"], offset = compTbl["offset"].get_or(0);
if(vfx){
sol::table meshTbl = compTbl["mesh"];
@@ -104,7 +104,7 @@ namespace battleship{
Vector3 compPos = Vector3::VEC_ZERO;
Quaternion compRot = Quaternion::QUAT_W;
float sc = 1;
float sc = compTbl["scale"].get_or(1);
if((sol::optional<sol::table>)compTbl["pos"] != sol::nullopt){
sol::table posTable = compTbl["pos"];
@@ -116,9 +116,6 @@ namespace battleship{
compRot = Quaternion(rotTable["w"], rotTable["x"], rotTable["y"], rotTable["z"]);
}
if((sol::optional<float>)compTbl["scale"] != sol::nullopt) float sc = compTbl["scale"];
if((sol::optional<string>)meshTbl["path"] != sol::nullopt){
mat = new Material(Root::getSingleton()->getLibPath() + "texture");
@@ -187,12 +184,12 @@ namespace battleship{
parNode->attachChild(flashNode);
fxComponents.push_back(FxManager::Fx::Component((void*)flashNode, vfx, duration, compPos));
fxComponents.push_back(FxManager::Fx::Component((void*)flashNode, vfx, duration, compPos, offset));
}
else{
sf::SoundBuffer *sfxBuffer = new sf::SoundBuffer();
sf::Sound *sfx = GameObject::prepareSfx(sfxBuffer, compTbl["path"]);
fxComponents.push_back(FxManager::Fx::Component((void*)sfx, vfx, duration));
fxComponents.push_back(FxManager::Fx::Component((void*)sfx, vfx, duration, Vector3::VEC_ZERO, offset));
}
}