Skip to content

Commit 7e7be63

Browse files
broken-bytesbroken-bytes
authored
Merge pull request #3 from broken-bytes/dev
Dev
2 parents f56e46a + 6239231 commit 7e7be63

30 files changed

+1901
-260
lines changed

‎CMakeLists.txt‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,23 @@ set(CMAKE_CXX_STANDARD 17)
33
set(CMAKE_CXX_STANDARD_REQUIRED ON)
44

55
set(APP DualSense4Windows)
6+
set(ASSET_PACKER AssetPacker)
67
project(${APP})
78

89

910
set(CMAKE_SUPPRESS_REGENERATION true)
10-
1111
set(SRC_INC
12+
include/Core.hxx
1213
include/ControllerKit.hxx
1314
include/DualSense.hxx
1415
include/Math.hxx
1516
include/Utils.hxx
1617
include/App.hxx
1718
include/Interface.hxx
1819
include/Types.hxx
20+
include/Window.hxx
21+
include/MainWindow.hxx
22+
include/ColorPicker.hxx
1923
)
2024

2125
set(SRC
@@ -24,26 +28,30 @@ set(SRC
2428
src/Utils.cxx
2529
src/App.cxx
2630
src/Interface.cxx
31+
src/MainWindow.cxx
32+
src/ColorPicker.cxx
33+
DualSense4Windows.exe.manifest
2734
)
2835

29-
set(ASSETS "$<TARGET_FILE_DIR:${APP}>/assets")
36+
set(ASSETS "$<TARGET_FILE_DIR:${APP}>/assets")
37+
38+
#add_executable(AssetPacker include/Base64.hxx src/Base64.cxx src/AssetPacker.cxx)
39+
#target_include_directories(${ASSET_PACKER} PUBLIC external/gumbo)
40+
#target_link_directories(${ASSET_PACKER} PUBLIC lib/)
41+
#target_link_libraries(${ASSET_PACKER} gumbo.lib)
42+
3043

3144
add_executable(${APP} WIN32 ${SRC} ${SRC_INC})
3245
target_link_directories(${APP} PUBLIC lib/)
33-
target_link_libraries(${APP} Xinput.lib)
34-
target_link_libraries(${APP} AppCore.lib)
35-
target_link_libraries(${APP} Ultralight.lib)
36-
target_link_libraries(${APP} UltralightCore.lib)
37-
target_link_libraries(${APP} WebCore.lib)
3846
target_link_libraries(${APP} hidapi.lib)
3947
target_link_libraries(${APP} setupapi)
4048
target_link_libraries(${APP} ViGEmClient.lib)
4149
target_include_directories(${APP} PUBLIC external/)
4250
target_include_directories(${APP} PRIVATE include/)
4351

52+
4453
add_custom_command(TARGET ${APP} POST_BUILD
4554
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/assets/" "${ASSETS}")
4655

4756
add_custom_command(TARGET ${APP} POST_BUILD
4857
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/bin" "$<TARGET_FILE_DIR:${APP}>")
49-

‎DualSense4Windows.exe.manifest‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
3+
<assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="DualSense4Windows" type="win32"/>
4+
<description>DualSenseController4Windows</description>
5+
<dependency>
6+
<dependentAssembly>
7+
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls"
8+
9+
version="6.0.0.0" processorArchitecture="*"
10+
11+
publicKeyToken="6595b64144ccf1df" language="*"/>
12+
</dependentAssembly>
13+
</dependency>
14+
</assembly>

‎assets/css/bootstrap.min.css‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎assets/css/styles.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
body {
2+
background-color: #FFFFFF;
3+
}

‎assets/html/app.html‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
11
<html>
22
<head>
3-
<link rel="stylesheet" href="../css/bootstrap.min.css"/>
43
<link rel="stylesheet" href="../css/styles.css"/>
4+
<script type="text/javascript" src="../js/main.js">
5+
</script>
56
</head>
67
<body>
78
<div id="content">
9+
<img src = "../img/dualsense.jpg"/>
810
<div class="container">
9-
<div class="row align-items-start">
10-
<div class="col">
11-
One of three columns
12-
</div>
13-
<div class="col">
14-
One of three columns
15-
</div>
16-
<div class="col">
17-
One of three columns
18-
</div>
19-
<div class="col">
20-
One of three columns
21-
</div>
11+
<div id = "device-data">
2212
</div>
2313
</div>
2414
</div>

‎assets/img/dualsense.jpg‎

17.1 KB
Loading

‎assets/js/bootstrap.min.js‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎assets/js/main.js‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
2+
function GetDeviceNode(path, name, mode, color) {
3+
let column = document.createElement("div");
4+
column.className = "row align-items-start";
5+
6+
let cPath = document.createElement("div");
7+
cPath.className = "col"
8+
let pPath = document.createElement("p");
9+
pPath.innerHTML = path;
10+
cPath.appendChild(pPath);
11+
12+
let cName = document.createElement("div");
13+
cName.className = "col";
14+
let pName = document.createElement("p");
15+
pName.innerHTML = name;
16+
cName.appendChild(pName);
17+
18+
let cMode = document.createElement("div");
19+
cMode.className = "col";
20+
let pMode = document.createElement("p");
21+
pMode.innerHTML = mode;
22+
cMode.appendChild(pMode);
23+
24+
25+
let cColor = document.createElement("div");
26+
cColor.className = "col";
27+
let pColor = document.createElement("p");
28+
pColor.innerHTML = color;
29+
cColor.appendChild(pColor);
30+
31+
column.appendChild(cPath);
32+
column.appendChild(cName);
33+
column.appendChild(cMode);
34+
column.appendChild(cColor);
35+
return column;
36+
}
37+
38+
function OnDualSenseDevicesUpdated(devices) {
39+
let deviceData = document.getElementById('device-data');
40+
devices.devices.forEach((device, i) => {
41+
deviceData.appendChild(GetDeviceNode(i, "DualSense", device.device, "Green"));
42+
});
43+
}
44+
45+
function Init() {
46+
}

0 commit comments

Comments
 (0)