SpawnShipNear velocity matching #3674

fluffyfreak · 2016-04-04T15:15:27Z

Use the target bodies velocity, if it's a ship then it will inherit their velocity, otherwise the behaviour is the same as it currently is.

@walterar this is how I'd prefer to fix what you suggested in #3669, alternatively it could take an extra parameter to specify the velocity if you like.

…heir velocity.

walterar · 2016-04-04T17:31:38Z

Wonderful. I tried it and, as it is, significantly improves the function.

If you want, an additional parameter to set a speed_plus would be really good.

fluffyfreak · 2016-04-05T10:34:30Z

I've added a 6th optional parameter, you can pass the 5th hyperspace information as nil like

local ship = Ship.SpawnNear("viper_police_craft", Game.player, 10, 10, nil, velocity)
or as before like
local ship = Ship.SpawnNear("viper_police_craft", Game.player, 10, 10)

Maybe @laarmen has an opinion on these changes too?

walterar · 2016-04-05T12:58:32Z

No, What I mean is add, to your original PR, a "fine tune"; for to do, for example:

local fine_tune = 0-- < default value of fine_tune
if case1 then
    fine_tune = 450-- < vel target + 450 m/s
elseif case2 then
    fine_tune = - 450-- < vel target - 450 m/s
end
ship = Space.SpawnShipNear("viper_police_craft", target,  50, 100, nil, fine_tune)

-- * case1: the ship appears chasing the target, to initial vel = vel_target + 450 m/s

-- * case2: the ship appears chasing the target, to initial vel_target - 450 m/s

laarmen · 2016-04-05T14:29:10Z

I'm not looking at the code, but from the example it isn't exactly clear:
is velocity relative to the target or to the frame?

On Tue, Apr 5, 2016 at 2:58 PM Walter Arnolfo notifications@github.com
wrote:

No, What I mean is add, to your original PR, a "fine tune"; for to do, for
example:

local fine_tune = 0-- < default value of fine_tune
if cases1 then
fine_tune = 450-- < vel target + 450 m/s
elseif cases2 then
fine_tune = - 450-- < vel target - 450 m/s
end
ship = Space.SpawnShipNear("viper_police_craft", target, 50, 100, nil, fine_tune)

-- * case1: the ship appears chasing the target, to initial vel =
vel_target + 450 m/s

-- * case2: the ship appears chasing the target, to initial vel_target -
450 m/s

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#3674 (comment)

walterar · 2016-04-05T14:33:03Z

@fluffyfreak I'm testing this, as you see it?

--- old/LuaSpace.cpp
+++ new/LuaSpace.cpp
@@ -89,13 +89,12 @@
  * Examples:
  *
  * > -- spawn a ship 5-6AU from the system centre
- * > local ship = Ship.Spawn("eagle_lrf", 5, 6)
+ * > local ship = Space.Spawn("eagle_lrf", 5, 6)
  *
  * > -- spawn a ship in the ~11AU hyperspace area and make it appear that it
  * > -- came from Sol and will arrive in ten minutes
- * > local ship = Ship.Spawn(
- * >     "flowerfairy", 9, 11,
- * >     { SystemPath:New(0,0,0), Game.time + 600 }
+ * > local ship = Space.Spawn("flowerfairy", 9, 11,
+ * >              { SystemPath:New(0,0,0), Game.time + 600 }
  * > )
  *
  * Availability:
@@ -152,7 +151,7 @@
  *
  * Create a ship and place it in space near the given <Body>.
  *
- * > ship = Space.SpawnShip(type, body, min, max, hyperspace)
+ * > ship = Space.SpawnShipNear(type, body, dist, tune, hyperspace)
  *
  * Parameters:
  *
@@ -160,9 +159,9 @@
  *
  *   body - the <Body> near which the ship should be spawned
  *
- *   min - minimum distance from the body to place the ship, in Km
- *
- *   max - maximum distance to place the ship
+ *   dist - distance from the body to place the ship, in Km
+ *
+ *   tune - fine tune to init vel (vel player + or - tune), in m/s
  *
  *   hyperspace - optional table containing hyperspace entry information. If
  *                this is provided the ship will not spawn directly. Instead,
@@ -178,7 +177,7 @@
  * Example:
  *
  * > -- spawn a ship 10km from the player
- * > local ship = Ship.SpawnNear("viper_police_craft", Game.player, 10, 10)
+ * > local ship = Space.SpawnShipNear("viper_police_craft", Game.player, 10, 10)
  *
  * Availability:
  *
@@ -200,8 +199,8 @@
        luaL_error(l, "Unknown ship type '%s'", type);

    Body *nearbody = LuaObject<Body>::CheckFromLua(2);
-   float min_dist = luaL_checknumber(l, 3);
-   float max_dist = luaL_checknumber(l, 4);
+   float dist = luaL_checknumber(l, 3);
+   float tune = luaL_checknumber(l, 4);

    SystemPath *path = 0;
    double due = -1;
@@ -214,7 +213,7 @@

    // XXX protect against spawning inside the body
    Frame * newframe = nearbody->GetFrame();
-   const vector3d newPosition = (MathUtil::RandomPointOnSphere(min_dist, max_dist)* 1000.0) + nearbody->GetPosition();
+   const vector3d newPosition = (dist * 1000.0) + nearbody->GetPosition();

    // If the frame is rotating and the chosen position is too far, use non-rotating parent.
    // Otherwise the ship will be given a massive initial velocity when it's bumped out of the
@@ -227,6 +226,7 @@
    thing->SetFrame(newframe);;
    thing->SetPosition(newPosition);
    thing->SetVelocity(vector3d(0,0,0));
+   thing->SetVelocity(nearbody->GetVelocity() + tune);
    Pi::game->GetSpace()->AddBody(thing);

    LuaObject<Ship>::PushToLua(ship);
@@ -461,7 +461,7 @@
  * Example:
  *
  * > -- spawn a ship 10km from the player
- * > local ship = Ship.SpawnShipLandedNear("viper_police", Game.player, 10, 10)
+ * > local ship = Space.SpawnShipLandedNear("viper_police", Game.player, 10, 10)
  *
  * Availability:
  *
pp
@@ -89,13 +89,12 @@
  * Examples:
  *
  * > -- spawn a ship 5-6AU from the system centre
- * > local ship = Ship.Spawn("eagle_lrf", 5, 6)
+ * > local ship = Space.Spawn("eagle_lrf", 5, 6)
  *
  * > -- spawn a ship in the ~11AU hyperspace area and make it appear that it
  * > -- came from Sol and will arrive in ten minutes
- * > local ship = Ship.Spawn(
- * >     "flowerfairy", 9, 11,
- * >     { SystemPath:New(0,0,0), Game.time + 600 }
+ * > local ship = Space.Spawn("flowerfairy", 9, 11,
+ * >              { SystemPath:New(0,0,0), Game.time + 600 }
  * > )
  *
  * Availability:
@@ -152,7 +151,7 @@
  *
  * Create a ship and place it in space near the given <Body>.
  *
- * > ship = Space.SpawnShip(type, body, min, max, hyperspace)
+ * > ship = Space.SpawnShipNear(type, body, dist, tune, hyperspace)
  *
  * Parameters:
  *
@@ -160,9 +159,9 @@
  *
  *   body - the <Body> near which the ship should be spawned
  *
- *   min - minimum distance from the body to place the ship, in Km
- *
- *   max - maximum distance to place the ship
+ *   dist - distance from the body to place the ship, in Km
+ *
+ *   tune - fine tune to init vel (vel player + or - tune), in m/s
  *
  *   hyperspace - optional table containing hyperspace entry information. If
  *                this is provided the ship will not spawn directly. Instead,
@@ -178,7 +177,7 @@
  * Example:
  *
  * > -- spawn a ship 10km from the player, to vel player + 10 m/s
- * > local ship = Ship.SpawnNear("viper_police_craft", Game.player, 10, 10)
+ * > local ship = Space.SpawnShipNear("viper_police_craft", Game.player, 10, 10)
  *
  * Availability:
  *
@@ -200,8 +199,8 @@
        luaL_error(l, "Unknown ship type '%s'", type);

    Body *nearbody = LuaObject<Body>::CheckFromLua(2);
-   float min_dist = luaL_checknumber(l, 3);
-   float max_dist = luaL_checknumber(l, 4);
+   float dist = luaL_checknumber(l, 3);
+   float tune = luaL_checknumber(l, 4);

    SystemPath *path = 0;
    double due = -1;
@@ -214,7 +213,7 @@

    // XXX protect against spawning inside the body
    Frame * newframe = nearbody->GetFrame();
-   const vector3d newPosition = (MathUtil::RandomPointOnSphere(min_dist, max_dist)* 1000.0) + nearbody->GetPosition();
+   const vector3d newPosition = (dist * 1000.0) + nearbody->GetPosition();

    // If the frame is rotating and the chosen position is too far, use non-rotating parent.
    // Otherwise the ship will be given a massive initial velocity when it's bumped out of the
@@ -227,6 +226,7 @@
    thing->SetFrame(newframe);;
    thing->SetPosition(newPosition);
    thing->SetVelocity(vector3d(0,0,0));
+   thing->SetVelocity(nearbody->GetVelocity() + tune);
    Pi::game->GetSpace()->AddBody(thing);

    LuaObject<Ship>::PushToLua(ship);
@@ -461,7 +461,7 @@
  * Example:
  *
  * > -- spawn a ship 10km from the player
- * > local ship = Ship.SpawnShipLandedNear("viper_police", Game.player, 10, 10)
+ * > local ship = Space.SpawnShipLandedNear("viper_police", Game.player, 10, 10)
  *
  * Availability:
  *

fluffyfreak · 2016-04-05T14:33:10Z

"Target", it spawns a ship near to another object and then gives it the targets velocity.

@walterar you can do that kind of change within the Lua itself once #3669 gets merged by just gettings the targets velocity and altering it slightly.

By default it will get the targets velocity

fluffyfreak · 2016-04-05T14:35:35Z

Sorry @walterar what am I looking for in that post?

walterar · 2016-04-05T15:25:24Z

I corrected some errors in the original documentation. It is not "Ship.SpawnNear (" is "Space.SpawnNear ("
The main changes I'm testing are these:

-   float min_dist = luaL_checknumber(l, 3);
-   float max_dist = luaL_checknumber(l, 4);
+   float dist = luaL_checknumber(l, 3);
+   float tune = luaL_checknumber(l, 4);

-   const vector3d newPosition = (MathUtil::RandomPointOnSphere(min_dist, max_dist)* 1000.0) + nearbody->GetPosition();
+   const vector3d newPosition = (dist * 1000.0) + nearbody->GetPosition();

    thing->SetVelocity(vector3d(0,0,0));
+   thing->SetVelocity(nearbody->GetVelocity() + tune);
    Pi::game->GetSpace()->AddBody(thing);

walterar · 2016-04-05T16:40:09Z

@fluffyfreak If I have to choose, I prefer the first option of this PR. It is really improved a lot, and it works without touching anything in the lua modules.
Do not worry about it, you have more important things than this to do in the Pioneer engine.
Meanwhile I'll experiment a little.

fluffyfreak · 2016-04-05T20:39:03Z

@walterar you can use it without changing any code, the other parameters are optional so everything work just as in the first commit.

If you do want to write some new code and set a velocity though, that is when you can add the 6th parameter :)

walterar · 2016-04-05T22:10:15Z

@fluffyfreak
I do not need a sixth parameter because I prefer to decide if I want a random distance, or not.
I'm testing the code is above. A small mod of your original code.
I am amazed how have improved the combat scenes.
But, for Pioneer vanilla, it is better the way you did. For now. ;)

👍 :)

fluffyfreak · 2016-04-06T12:34:36Z

Right I'll consider this review ready then.

laarmen · 2016-04-06T12:47:15Z

Will try to do it tonight (or this afternoon if I can catch 20mn, although
it will be a read-only review, no hands-on testing), but no promises.

On Wed, Apr 6, 2016 at 2:34 PM Andrew Copland notifications@github.com
wrote:

Right I'll consider this review ready then.

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#3674 (comment)

laarmen · 2016-04-06T19:58:55Z

Allright. I haven't even tested it but AFAIUI you wanted the 6th argument to be optional, right? Then you need to check for the existence of the said 6th argument. Otherwise apocalypse, mayhem, looting corpses and application crashes will likely occur (in that specific order) with legacy code.

Further more, as the author of the pi_lua_strict_pull family of methods, I would advise you NOT to use them directly in "application" code, they're more intended for use in higher abstraction parts.

So, all in all I'd replace the argument parsing part by something along the lines of

    vector3d newVelocity;
    if (!lua_isnone(l, 6))
        newVelocity = *LuaVector::CheckFromLua(l, 6); // If we have a 6th argument, it better be a vector, otherwise ERROR!!! Hence Check and not Get
    else
        newVelocity = nearbody->GetVelocity();

Cheers mate!

fluffyfreak · 2016-04-06T20:19:32Z

Thanks @laarmen made that change

laarmen · 2016-04-07T10:25:17Z

I'll get back to that when we get the #3678 sorted out.

Use the target bodies velocity, if it's a ship then it will inherit t…

eef2357

…heir velocity.

laarmen added the in progress label Apr 4, 2016

Optional 6th velocity parameter

4cce3a8

fluffyfreak added the WIP label Apr 5, 2016

fluffyfreak removed the WIP label Apr 6, 2016

laarmen added the WIP label Apr 6, 2016

Safer usage of the 6th, optional, parameter.

e3201dd

fluffyfreak added the Lua API label Apr 6, 2016

fluffyfreak merged commit 07c16d8 into pioneerspacesim:master Apr 20, 2016

fluffyfreak deleted the SpawnShipNearWithVelocity branch April 20, 2016 08:16

laarmen removed the in progress label Apr 20, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SpawnShipNear velocity matching #3674

SpawnShipNear velocity matching #3674

fluffyfreak commented Apr 4, 2016

walterar commented Apr 4, 2016

fluffyfreak commented Apr 5, 2016

walterar commented Apr 5, 2016

laarmen commented Apr 5, 2016

walterar commented Apr 5, 2016

fluffyfreak commented Apr 5, 2016

fluffyfreak commented Apr 5, 2016

walterar commented Apr 5, 2016

walterar commented Apr 5, 2016

fluffyfreak commented Apr 5, 2016

walterar commented Apr 5, 2016

fluffyfreak commented Apr 6, 2016

laarmen commented Apr 6, 2016

laarmen commented Apr 6, 2016

fluffyfreak commented Apr 6, 2016

laarmen commented Apr 7, 2016

SpawnShipNear velocity matching #3674

SpawnShipNear velocity matching #3674

Conversation

fluffyfreak commented Apr 4, 2016

walterar commented Apr 4, 2016

fluffyfreak commented Apr 5, 2016

walterar commented Apr 5, 2016

laarmen commented Apr 5, 2016

walterar commented Apr 5, 2016

fluffyfreak commented Apr 5, 2016

fluffyfreak commented Apr 5, 2016

walterar commented Apr 5, 2016

walterar commented Apr 5, 2016

fluffyfreak commented Apr 5, 2016

walterar commented Apr 5, 2016

fluffyfreak commented Apr 6, 2016

laarmen commented Apr 6, 2016

laarmen commented Apr 6, 2016

fluffyfreak commented Apr 6, 2016

laarmen commented Apr 7, 2016