Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-09 12:22:34 +01:00
Code Issues Projects Releases Activity

Merge pull request #164 from JayFoxRox/fix-taxi

Browse Source 
Stub Taxi-Mission
This commit is contained in:
Daniel Evans 2016-07-02 17:51:04 +01:00 committed by GitHub
commit cd0a11d899
6 changed files with 187 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rwengine/include/objects/VehicleObject.hpp
View File

@ -132,6 +132,12 @@ public:
void setPrimaryColour(uint8_t color);
void setSecondaryColour(uint8_t color);
/**
* @brief isStopped
* @return True if the vehicle isn't moving
*/
bool isStopped() const;
private:
void registerPart(ModelFrame* mf);

7
rwengine/src/objects/CharacterObject.cpp
View File

@ -467,8 +467,11 @@ bool CharacterObject::enterVehicle(VehicleObject* vehicle, size_t seat)
bool CharacterObject::isStopped() const
{
RW_UNIMPLEMENTED("Checking if character is stopped");
return true;
if (currentVehicle != nullptr) {
return currentVehicle->isStopped();
}
return controller->getCurrentActivity() == nullptr;
}
VehicleObject *CharacterObject::getCurrentVehicle() const

5
rwengine/src/objects/VehicleObject.cpp
View File

@ -752,6 +752,11 @@ void VehicleObject::setSecondaryColour(uint8_t color)
colourSecondary = engine->data->vehicleColours[color];
}
bool VehicleObject::isStopped() const
{
return fabsf(physVehicle->getCurrentSpeedKmHour()) < 0.75f;
}
void *VehicleRaycaster::castRay(const btVector3 &from, const btVector3 &to, btVehicleRaycaster::btVehicleRaycasterResult &result)
{
ClosestNotMeRayResultCallback rayCallback( _vehicle->physBody, from, to );

5
rwengine/src/script/modules/GameModule.cpp
View File

@ -1255,7 +1255,7 @@ GameModule::GameModule()
bindFunction(0x018A, game_add_location_blip, 4, "Add Blip for Coord");
bindFunction(0x018B, game_change_blip_mode, 2, "Change Blip Display Mode");
bindUnimplemented( 0x018C, game_play_sound_at, 4, "Play Sound At" );
bindUnimplemented( 0x018D, game_create_soundscape, 5, "Create soundscape" );
bindUnimplemented( 0x018E, game_remove_sound, 1, "Remove Sound" );
@ -1357,7 +1357,8 @@ GameModule::GameModule()
bindFunction(0x030D, game_set_max_progress, 1, "Set Max Progress" );
bindFunction(0x0314, game_set_unique_jumps, 1, "Set Total Unique Jumps" );
bindUnimplemented( 0x0315, game_increment_taxi_dropoffs, 0, "Increment Taxi Dropoffs" );
bindUnimplemented( 0x0316, game_register_taxi_money, 1, "Register Taxi Money" );
bindUnimplemented( 0x0317, game_increment_mission_attempts, 0, "Increment Mission Attempts" );
bindFunction(0x0318, game_set_last_mission, 1, "Set Last completed mission" );

164
rwengine/src/script/modules/ObjectModule.cpp
View File

@ -47,12 +47,22 @@ void game_create_player(const ScriptArguments& args)
*args[4].globalInteger = args.getWorld()->players.size()-1;
}
template<class Tobject>
void game_get_object_position(const ScriptArguments& args)
{
auto object = args.getObject<Tobject>(0);
auto position = object->getPosition();
*args[1].globalReal = position.x;
*args[2].globalReal = position.y;
*args[3].globalReal = position.z;
}
template<class Tobject>
void game_set_object_position(const ScriptArguments& args)
{
auto character = args.getObject<Tobject>(0);
auto object = args.getObject<Tobject>(0);
glm::vec3 position(args[1].real, args[2].real, args[3].real);
character->setPosition(position + spawnMagic);
object->setPosition(position + spawnMagic);
}
bool game_player_in_area_2d(const ScriptArguments& args)
@ -325,6 +335,31 @@ bool game_player_stopped_near_point_on_foot_3d(const ScriptArguments& args)
return false;
}
bool game_is_player_in_vehicle_near_character(const ScriptArguments& args)
{
auto player = static_cast<CharacterObject*>(args.getPlayerCharacter(0));
auto character = static_cast<CharacterObject*>(args.getObject<CharacterObject>(1));
glm::vec3 size(args[2].real, args[3].real, args[4].real);
bool drawSphere = !!args[5].integerValue();
auto center = character->getPosition();
auto vehicle = player->getCurrentVehicle();
if(vehicle) {
auto distance = center - player->getPosition();
distance /= size;
if (glm::length(distance) < 1.f) {
return true;
}
}
if (drawSphere) {
args.getWorld()->drawAreaIndicator(AreaIndicatorInfo::Cylinder, center, size); //FIXME!
}
return false;
}
bool game_character_near_point_in_vehicle(const ScriptArguments& args)
{
auto character = static_cast<CharacterObject*>(args.getObject<CharacterObject>(0));
@ -601,6 +636,14 @@ bool game_vehicle_stopped(const ScriptArguments& args)
return false;
}
bool game_is_vehicle_health_greater_than(const ScriptArguments& args)
{
RW_UNIMPLEMENTED("game_is_vehicle_health_greater_than");
RW_UNUSED(args);
/// @todo
return true;
}
/// Remove object from cleanup at end of missions.
void game_dont_remove_object(const ScriptArguments& args)
{
@ -688,20 +731,11 @@ bool game_character_stoped_in_volume(const ScriptArguments& args)
glm::vec3 pp = character->getPosition();
if (pp.x >= min.x && pp.y >= min.y && pp.z >= min.z &&
pp.x <= max.x && pp.y <= max.y && pp.z <= max.z )
{
if( character->getCurrentVehicle() != nullptr )
{
return character->getCurrentVehicle()->physVehicle->getCurrentSpeedKmHour() < 0.75f;
}
else
{
return character->controller->getCurrentActivity() == nullptr;
}
pp.x <= max.x && pp.y <= max.y && pp.z <= max.z) {
return character->isStopped();
}
if( drawCylinder )
{
if (drawCylinder) {
args.getWorld()->drawAreaIndicator(AreaIndicatorInfo::Cylinder, (max+min)/2.f, (max-min)/2.f);
}
@ -730,6 +764,32 @@ bool game_locate_vehicle_near_point_2D(const ScriptArguments& args)
return false;
}
bool game_vehicle_stopped_in_volume(const ScriptArguments& args)
{
auto vehicle = static_cast<VehicleObject*>(args.getObject<VehicleObject>(0));
glm::vec3 vec1(args[1].realValue(), args[2].realValue(), args[3].realValue());
glm::vec3 vec2(args[4].realValue(), args[5].realValue(), args[6].realValue());
bool drawCylinder = !!args[7].integerValue();
glm::vec3 min = glm::min(vec1, vec2);
glm::vec3 max = glm::max(vec1, vec2);
glm::vec3 pp = vehicle->getPosition();
if (pp.x >= min.x && pp.y >= min.y && pp.z >= min.z &&
pp.x <= max.x && pp.y <= max.y && pp.z <= max.z) {
return vehicle->isStopped();
}
if (drawCylinder) {
args.getWorld()->drawAreaIndicator(AreaIndicatorInfo::Cylinder, (max+min)/2.f, (max-min)/2.f);
}
return false;
}
template <class T>
bool game_is_character_stopped(const ScriptArguments& args)
{
@ -812,6 +872,56 @@ bool game_player_in_taxi(const ScriptArguments& args)
return (vehicle && (vehicle->vehicle->classType & VehicleData::TAXI) == VehicleData::TAXI);
}
void game_get_random_character_in_zone(const ScriptArguments& args)
{
const auto& zones = args.getWorld()->data->zones;
std::string zname(args[0].string);
// Only try to find a character if this is a known zone
auto zfind = zones.find(zname);
if(zfind != zones.end()) {
// Create a list of candidate characters by iterating and checking if the char is in this zone
std::vector<std::pair<GameObjectID, GameObject*>> candidates;
for(auto& p : args.getWorld()->pedestrianPool.objects) {
auto character = static_cast<CharacterObject*>(p.second);
// We only consider characters walking around normally
/// @todo not sure if we are able to grab script objects or players too
if(character->getLifetime() != GameObject::TrafficLifetime) {
continue;
}
// Check if character is in this zone
auto cp = character->getPosition();
auto& min = zfind->second.min;
auto& max = zfind->second.max;
if (cp.x > min.x && cp.y > min.y && cp.z > min.z &&
cp.x < max.x && cp.y < max.y && cp.z < max.z) {
candidates.push_back(p);
}
}
// Only return a result if we found a character
unsigned int candidateCount = candidates.size();
if (candidateCount > 0) {
// Return the handle for any random character in this zone and use lifetime for use by script
// @todo verify if the lifetime is actually changed in the original game
unsigned int randomIndex = std::rand() % candidateCount;
const auto p = candidates[randomIndex];
auto character = static_cast<CharacterObject*>(p.second);
character->setLifetime(GameObject::UnknownLifetime);
*args[1].globalInteger = p.first;
return;
}
}
// If we didn't find any character in the zone return -1
*args[1].globalInteger = -1;
}
void game_get_speed(const ScriptArguments& args)
{
auto vehicle = static_cast<VehicleObject*>(args.getObject<VehicleObject>(0));
@ -882,6 +992,9 @@ void game_character_exit_vehicle(const ScriptArguments& args)
if( cvehcile && cvehcile == vehicle )
{
// Cancel whatever we're currently trying to do.
character->controller->skipActivity();
// Now leave the vehicle immediately
character->controller->setNextActivity(new Activities::ExitVehicle());
}
}
@ -1127,6 +1240,13 @@ void game_set_close_object_visible(const ScriptArguments& args)
}
}
void game_set_character_running(const ScriptArguments& args)
{
auto character = static_cast<CharacterObject*>(args.getObject<CharacterObject>(0));
bool running = !!args[1].integerValue();
character->setRunning(running);
}
void game_change_nearest_model(const ScriptArguments& args)
{
glm::vec3 position(args[0].real, args[1].real, args[2].real);
@ -1243,6 +1363,7 @@ ObjectModule::ObjectModule()
bindUnimplemented( 0x009F, game_character_make_idle, 1, "Set Character to Idle" );
bindFunction(0x00A0, game_get_object_position<CharacterObject>, 4, "Get Character Position" );
bindFunction(0x00A1, game_set_object_position<CharacterObject>, 4, "Set Character Position" );
bindFunction(0x00A5, game_create_vehicle, 5, "Create Vehicle" );
@ -1281,6 +1402,8 @@ ObjectModule::ObjectModule()
bindFunction(0x00F7, game_player_near_point_in_vehicle_3D, 8, "Is Player near point in car" );
bindFunction(0x00F9, game_player_stopped_near_point_on_foot_3d, 8, "Detect player stopped on foot area 3d" );
bindFunction(0x00FD, game_is_player_in_vehicle_near_character, 6, "Is Player in Vehicle Near Character");
bindFunction(0x0100, game_character_near_point_in_vehicle, 8, "Is Character near point in car" );
bindFunction(0x0108, game_destroy_object<InstanceObject>, 1, "Destroy Object" );
@ -1311,6 +1434,8 @@ ObjectModule::ObjectModule()
bindFunction(0x0176, game_get_object_heading<InstanceObject>, 2, "Get Object heading" );
bindFunction(0x0177, game_set_object_heading<InstanceObject>, 2, "Set Object heading" );
bindFunction(0x0185, game_is_vehicle_health_greater_than, 2, "Is Vehicle Health Greater Than" );
bindUnimplemented( 0x0192, game_character_stand_still, 1, "Make character stand still" );
bindFunction(0x0199, game_character_in_area_or_cylinder<PlayerController>, 6, "Is Player in Area or Cylinder" );
@ -1322,6 +1447,7 @@ ObjectModule::ObjectModule()
bindFunction(0x01A8, game_character_stoped_in_volume<CharacterObject>, 8, "Is Char Stopped in volume" );
bindFunction(0x01AA, game_character_stoped_in_volume_in_vehicle<CharacterObject>, 8, "Is Char Stopped in cube in vehicle" );
bindFunction(0x01AC, game_vehicle_stopped_in_volume, 8, "Is Vehicle Stopped in volume" );
bindFunction(0x01AD, game_locate_vehicle_near_point_2D, 6, "Locate Vehicle Near Point 2D" );
bindFunction(0x01B2, game_give_weapon_to_character, 3, "Give Weapon to Character" );
@ -1352,19 +1478,25 @@ ObjectModule::ObjectModule()
bindUnimplemented( 0x020A, game_lock_vehicle_doors, 2, "Lock Car Doors" );
bindUnimplemented( 0x020F, game_turn_character_to_face_player, 2, "Turn Character to Face Player" );
bindFunction(0x0211, game_navigate_on_foot, 3, "Character go to on foot" );
bindFunction(0x0213, game_create_pickup, 6, "Create pickup");
bindFunction(0x0214, game_is_pickup_collected, 1, "Has Pickup been collected");
bindFunction(0x0215, game_destroy_pickup, 1, "Destroy Pickup");
bindUnimplemented( 0x0216, game_set_taxi_available_light, 2, "Set Taxi Available Light" );
bindFunction(0x0227, game_get_vehicle_health, 2, "Get Vehicle Health" );
bindFunction(0x0229, game_set_vehicle_colours, 3, "Set Vehicle Colours" );
bindFunction(0x0239, game_character_run_to, 3, "Character Run to" );
bindUnimplemented( 0x0243, game_set_character_personality, 2, "Set Character Personality" );
bindUnimplemented( 0x0291, set_character_attack_when_provoked, 2, "Set Character Attack When Provoked" );
bindFunction(0x029B, game_create_object_world, 5, "Create Object no offset" );
bindFunction(0x029C, game_is_boat, 1, "Is Vehicle Boat" );
@ -1376,10 +1508,12 @@ ObjectModule::ObjectModule()
bindFunction(0x02BF, game_is_vehicle_in_water, 1, "Is Vehicle in Water" );
bindFunction(0x02DD, game_get_random_character_in_zone, 2, "Get Random Character In Zone");
bindFunction(0x02DE, game_player_in_taxi, 1, "Is Player In Taxi" );
bindFunction(0x02E3, game_get_speed, 2, "Get Vehicle Speed" );
bindFunction(0x0319, game_set_character_running, 2, "Set Character Running" );
bindFunction(0x0320, game_character_in_range, 2, "Is Character in range of character");
bindFunction(0x032B, game_create_weapon_pickup, 7, "Create Weapon Pickup" );
@ -1394,6 +1528,8 @@ ObjectModule::ObjectModule()
bindFunction(0x0363, game_set_close_object_visible, 6, "Set Closest Object Visibility");
bindUnimplemented( 0x0365, game_set_character_objective_to_hail_taxi, 1, "Set Character Objective to Hail Taxi" );
bindUnimplemented( 0x0368, game_create_ev_crane, 10, "Create ev Crane" );
bindUnimplemented( 0x039C, game_set_car_watertight, 2, "Set Car Watertight" );

16
rwengine/src/script/modules/VMModule.cpp
View File

@ -217,6 +217,18 @@ void vm_mission_over(const ScriptArguments& args)
*args.getState()->scriptOnMissionFlag = 0;
}
void vm_sqrt(const ScriptArguments& args)
{
*args[1].globalReal -= std::sqrt(args[0].real);
}
void vm_random_int_in_range(const ScriptArguments& args)
{
auto min = args[0].integerValue();
auto max = args[1].integerValue();
*args[2].globalInteger = std::rand() % (max - min) + min;
}
void vm_name_thread(const ScriptArguments& args)
{
strncpy(args.getThread()->name, args[0].string, 16);
@ -300,6 +312,10 @@ VMModule::VMModule()
bindFunction(0x0D8, vm_mission_over, 0, "Set Mission Finished");
bindFunction(0x1FB, vm_sqrt, 2, "Sqrt");
bindFunction(0x209, vm_random_int_in_range, 3, "Random Int in Range");
bindFunction(0x2CD, vm_call, 2, "Call");
bindFunction(0x3A4, vm_name_thread, 1, "Name Thread");