3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed build on Linux and Mac

Browse source
This commit is contained in:
Enrico Turri 2019-10-21 15:20:36 +02:00
parent 3ce3f33c9c
commit d4f190a0c1
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/slic3r/GUI/Mouse3DController.cpp
View file

@ -335,10 +335,17 @@ bool Mouse3DController::connect_device()
// Searches for 1st connected 3Dconnexion device // Searches for 1st connected 3Dconnexion device
struct DeviceData struct DeviceData
{ {
std::string path{ "" }; std::string path;
int interface_number{ 0 }; int interface_number;
unsigned short usage_page{ 0 }; unsigned short usage_page;
unsigned short usage{ 0 }; unsigned short usage;
DeviceData()
: path(""), interface_number(0), usage_page(0), usage(0)
{}
DeviceData(const std::string& path, int interface_number, unsigned short usage_page, unsigned short usage)
: path(path), interface_number(interface_number), usage_page(usage_page), usage(usage)
{}
}; };
#if ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT #if ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT
@ -397,7 +404,7 @@ bool Mouse3DController::connect_device()
if (it == detected_devices.end()) if (it == detected_devices.end())
it = detected_devices.insert(DetectedDevices::value_type(detected_device, DeviceDataList())).first; it = detected_devices.insert(DetectedDevices::value_type(detected_device, DeviceDataList())).first;
it->second.push_back({ current->path, current->interface_number, current->usage_page, current->usage }); it->second.emplace_back(current->path, current->interface_number, current->usage_page, current->usage);
} }
} }
} }