feat(Personal Vehicle): Added clone personal vehicle feature. (#326)
This commit is contained in:
@ -9,6 +9,36 @@
|
||||
|
||||
namespace big
|
||||
{
|
||||
vehicle_preview_item::vehicle_preview_item()
|
||||
{
|
||||
this->name = "";
|
||||
this->display_name = "";
|
||||
this->display_manufacturer = "";
|
||||
this->hash = 0;
|
||||
}
|
||||
|
||||
vehicle_preview_item::vehicle_preview_item(nlohmann::json& item_json)
|
||||
{
|
||||
this->name = item_json["Name"];
|
||||
this->display_name = item_json["Name"];
|
||||
this->display_manufacturer = "";
|
||||
this->hash = item_json["Hash"];
|
||||
|
||||
if (!item_json["DisplayName"].is_null())
|
||||
{
|
||||
this->display_name = item_json["DisplayName"];
|
||||
}
|
||||
|
||||
if (!item_json["ManufacturerDisplayName"].is_null())
|
||||
{
|
||||
this->display_manufacturer = item_json["ManufacturerDisplayName"];
|
||||
}
|
||||
else if (!item_json["Manufacturer"].is_null())
|
||||
{
|
||||
this->display_manufacturer = item_json["Manufacturer"];
|
||||
}
|
||||
}
|
||||
|
||||
vehicle_preview_service::vehicle_preview_service() :
|
||||
m_vehicle_file(g_file_manager->get_project_file("./lib/vehicles.json"))
|
||||
{
|
||||
@ -17,12 +47,12 @@ namespace big
|
||||
else
|
||||
{
|
||||
g_thread_pool->push([this]()
|
||||
{
|
||||
if (remote::download_binary("http://github-proxy.damon.sh/DurtyFree/gta-v-data-dumps/master/vehicles.json", m_vehicle_file.get_path()))
|
||||
this->load();
|
||||
else
|
||||
LOG(WARNING) << "Failed to download vehicles.json data...";
|
||||
});
|
||||
{
|
||||
if (remote::download_binary("http://github-proxy.damon.sh/DurtyFree/gta-v-data-dumps/master/vehicles.json", m_vehicle_file.get_path()))
|
||||
this->load();
|
||||
else
|
||||
LOG(WARNING) << "Failed to download vehicles.json data...";
|
||||
});
|
||||
}
|
||||
|
||||
g_vehicle_preview_service = this;
|
||||
@ -33,9 +63,45 @@ namespace big
|
||||
g_vehicle_preview_service = nullptr;
|
||||
}
|
||||
|
||||
nlohmann::json& vehicle_preview_service::get_vehicle_list()
|
||||
const vehicle_preview_item& vehicle_preview_service::find_vehicle_item_by_hash(int hash)
|
||||
{
|
||||
return m_all_vehicles;
|
||||
int idx = -1;
|
||||
|
||||
if (m_hash_idx_map.count(hash))
|
||||
{
|
||||
idx = m_hash_idx_map[hash];
|
||||
}
|
||||
|
||||
if (idx == -1)
|
||||
{
|
||||
return empty_item;
|
||||
}
|
||||
else
|
||||
{
|
||||
return m_vehicle_preview_item_arr[idx];
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<vehicle_preview_item>& vehicle_preview_service::get_vehicle_preview_item_arr()
|
||||
{
|
||||
return m_vehicle_preview_item_arr;
|
||||
}
|
||||
|
||||
void vehicle_preview_service::set_preview_vehicle(const vehicle_preview_item& item)
|
||||
{
|
||||
if (item.hash != 0)
|
||||
{
|
||||
if (m_model_hash != item.hash)
|
||||
{
|
||||
m_model_hash = item.hash;
|
||||
m_new_model = true;
|
||||
}
|
||||
|
||||
if (!m_running)
|
||||
{
|
||||
g_thread_pool->push([this] { preview_loop(); });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void vehicle_preview_service::preview_loop()
|
||||
@ -43,61 +109,49 @@ namespace big
|
||||
if (m_running)
|
||||
return;
|
||||
m_running = true;
|
||||
|
||||
|
||||
g_fiber_pool->queue_job([this]
|
||||
{
|
||||
while (g_running && m_running && g->spawn.preview_vehicle && g_gui.m_opened)
|
||||
{
|
||||
auto location = ENTITY::GET_OFFSET_FROM_ENTITY_IN_WORLD_COORDS(self::ped, 2.5f, 2.5f, .5f);
|
||||
if (m_current_veh == -1)
|
||||
while (g_running && m_running && g->spawn.preview_vehicle && g_gui.m_opened)
|
||||
{
|
||||
m_new_model = false;
|
||||
location.z = -10.f;
|
||||
m_current_veh = vehicle::spawn(m_model, location, 0.f, false);
|
||||
ENTITY::FREEZE_ENTITY_POSITION(m_current_veh, true);
|
||||
ENTITY::SET_ENTITY_ALPHA(m_current_veh, 0, 0);
|
||||
ENTITY::SET_ENTITY_COLLISION(m_current_veh, false, false);
|
||||
ENTITY::SET_CAN_CLIMB_ON_ENTITY(m_current_veh, false);
|
||||
OBJECT::SET_OBJECT_ALLOW_LOW_LOD_BUOYANCY(m_current_veh, false);
|
||||
}
|
||||
else if (m_new_model)
|
||||
{
|
||||
entity::delete_entity(m_current_veh);
|
||||
auto location = ENTITY::GET_OFFSET_FROM_ENTITY_IN_WORLD_COORDS(self::ped, 0.f, 10.f, .5f);
|
||||
if (m_current_veh == -1)
|
||||
{
|
||||
m_new_model = false;
|
||||
location.z = -10.f;
|
||||
m_current_veh = vehicle::spawn(m_model_hash, location, 0.f, false);
|
||||
ENTITY::FREEZE_ENTITY_POSITION(m_current_veh, true);
|
||||
ENTITY::SET_ENTITY_ALPHA(m_current_veh, 0, 0);
|
||||
ENTITY::SET_ENTITY_COLLISION(m_current_veh, false, false);
|
||||
ENTITY::SET_CAN_CLIMB_ON_ENTITY(m_current_veh, false);
|
||||
OBJECT::SET_OBJECT_ALLOW_LOW_LOD_BUOYANCY(m_current_veh, false);
|
||||
}
|
||||
else if (m_new_model)
|
||||
{
|
||||
entity::delete_entity(m_current_veh);
|
||||
|
||||
m_current_veh = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (const int alpha = ENTITY::GET_ENTITY_ALPHA(m_current_veh); alpha < 250)
|
||||
ENTITY::SET_ENTITY_ALPHA(m_current_veh, std::min<int>(255, alpha + 10), 0);
|
||||
m_current_veh = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (const int alpha = ENTITY::GET_ENTITY_ALPHA(m_current_veh); alpha < 250)
|
||||
{
|
||||
ENTITY::SET_ENTITY_ALPHA(m_current_veh, std::min<int>(255, alpha + 10), 0);
|
||||
}
|
||||
|
||||
ENTITY::SET_ENTITY_HEADING(m_current_veh, m_heading);
|
||||
ENTITY::SET_ENTITY_COORDS(m_current_veh, location.x, location.y, location.z, 0, 0, 0, 0);
|
||||
ENTITY::SET_ENTITY_HEADING(m_current_veh, m_heading);
|
||||
ENTITY::SET_ENTITY_COORDS(m_current_veh, location.x, location.y, location.z, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
if (m_heading += 0.5f; m_heading > 359) m_heading = 0;
|
||||
|
||||
script::get_current()->yield();
|
||||
}
|
||||
|
||||
if (m_heading += 0.5f; m_heading > 359) m_heading = 0;
|
||||
|
||||
script::get_current()->yield();
|
||||
}
|
||||
|
||||
entity::delete_entity(m_current_veh);
|
||||
m_current_veh = -1;
|
||||
m_running = false;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
void vehicle_preview_service::set_preview_vehicle(const nlohmann::json& item)
|
||||
{
|
||||
if (m_model != item["Name"])
|
||||
{
|
||||
m_model = item["Name"];
|
||||
|
||||
m_new_model = true;
|
||||
}
|
||||
|
||||
if (!m_running)
|
||||
g_thread_pool->push([this] { preview_loop(); });
|
||||
entity::delete_entity(m_current_veh);
|
||||
m_current_veh = -1;
|
||||
m_running = false;
|
||||
});
|
||||
}
|
||||
|
||||
void vehicle_preview_service::stop_preview()
|
||||
@ -107,15 +161,35 @@ namespace big
|
||||
|
||||
void vehicle_preview_service::load()
|
||||
{
|
||||
m_hash_idx_map.clear();
|
||||
m_vehicle_preview_item_arr.clear();
|
||||
|
||||
std::ifstream file(m_vehicle_file.get_path());
|
||||
nlohmann::json all_vehicles;
|
||||
|
||||
try
|
||||
{
|
||||
file >> m_all_vehicles;
|
||||
file >> all_vehicles;
|
||||
}
|
||||
catch (const std::exception& ex)
|
||||
{
|
||||
LOG(WARNING) << "Failed to load vehicles.json:\n" << ex.what();
|
||||
}
|
||||
|
||||
for (auto& item_json : all_vehicles)
|
||||
{
|
||||
if (
|
||||
item_json["Hash"].is_null() ||
|
||||
item_json["Name"].is_null() ||
|
||||
!item_json["Bones"].is_array() ||
|
||||
item_json["Bones"][0] == "stub"
|
||||
)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
m_hash_idx_map[item_json["SignedHash"]] = (int)m_vehicle_preview_item_arr.size();
|
||||
m_vehicle_preview_item_arr.push_back(vehicle_preview_item(item_json));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3,6 +3,18 @@
|
||||
|
||||
namespace big
|
||||
{
|
||||
class vehicle_preview_item {
|
||||
|
||||
public:
|
||||
vehicle_preview_item();
|
||||
vehicle_preview_item(nlohmann::json& item_json);
|
||||
|
||||
std::string name;
|
||||
std::string display_name;
|
||||
std::string display_manufacturer;
|
||||
Hash hash;
|
||||
};
|
||||
|
||||
class vehicle_preview_service
|
||||
{
|
||||
file m_vehicle_file;
|
||||
@ -10,10 +22,12 @@ namespace big
|
||||
std::condition_variable m_cond;
|
||||
std::mutex m_mutex;
|
||||
|
||||
nlohmann::json m_all_vehicles;
|
||||
std::map<Hash, int> m_hash_idx_map;
|
||||
std::vector<vehicle_preview_item> m_vehicle_preview_item_arr;
|
||||
const vehicle_preview_item empty_item = vehicle_preview_item();
|
||||
|
||||
Vehicle m_current_veh = -1;
|
||||
std::string m_model;
|
||||
Hash m_model_hash;
|
||||
bool m_new_model = false;
|
||||
float m_heading = 0.f;
|
||||
bool m_running = false;
|
||||
@ -21,11 +35,11 @@ namespace big
|
||||
vehicle_preview_service();
|
||||
~vehicle_preview_service();
|
||||
|
||||
nlohmann::json& get_vehicle_list();
|
||||
const vehicle_preview_item& find_vehicle_item_by_hash(int hash);
|
||||
std::vector<vehicle_preview_item>& get_vehicle_preview_item_arr();
|
||||
void set_preview_vehicle(const vehicle_preview_item& item);
|
||||
|
||||
void preview_loop();
|
||||
|
||||
void set_preview_vehicle(const nlohmann::json& item);
|
||||
void stop_preview();
|
||||
|
||||
private:
|
||||
|
Reference in New Issue
Block a user