Disable images for renderhook for now (crash fix)
This commit is contained in:
parent
64f76e8adc
commit
90c4285f9f
96
.gitignore
vendored
96
.gitignore
vendored
@ -1,95 +1 @@
|
||||
.vs/
|
||||
tools/.vs/
|
||||
tools/build/
|
||||
tools/obj/
|
||||
.vs/CheatMenu/v16/.suo
|
||||
.vs/CheatMenu/v16/Browse.VC.db
|
||||
.vs/CheatMenu/v16/Solution.VC.db
|
||||
.vs/CheatMenu/v16/ipch/8a8161b1be2b4103.ipch
|
||||
.vs/CheatMenu/v16/ipch/e9b0a2fc8cb1509e.ipch
|
||||
.vs/CheatMenu/v16/ipch/e024ae0f5d73c047.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/265b236fe4986752/UI.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/38b746beec6fb244/IMGUI_WIDGETS.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/3e1cbf187f313294/WEAPON.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/756823df130098d3/HOOK.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/7a8af3ed3d3a54c4/TEXTURES.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/829db28faf316540/UTIL.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/9c90f2807ada373e/IMGUI.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/a09bb0abeabbe0f/LIBRARY.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/a4014625ad130402/VEHICLE.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/a40641fdc3b117af/TELEPORT.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/ab7214dce69112ca/PAINT.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/bbb77d6129ef6abe/CHEATMENU.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/bff6ab00c8dfdfd2/GAME.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/d1aef004461bf238/LIBRARY.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/ee897a6fe2800285/PLAYER.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/f13b890baaf60e88/NEON.ipch
|
||||
.vs/CheatMenu/v16/ipch/AutoPCH/f42ec7dda8d23a7b/PED.ipch
|
||||
.vs/CheatMenu2/v16/.suo
|
||||
.vs/CheatMenu2/v16/Browse.VC.db
|
||||
tools/.vs/CheatMenu/v16/.suo
|
||||
tools/.vs/CheatMenu/v16/Browse.VC.db
|
||||
tools/.vs/CheatMenu/v16/Solution.VC.db
|
||||
tools/CheatMenu.sln
|
||||
tools/Depend.vcxproj
|
||||
tools/CheatMenu.vcxproj
|
||||
tools/Depend.vcxproj.filters
|
||||
build/CheatMenu.sln
|
||||
build/CheatMenu.vcxproj
|
||||
build/Depend.vcxproj
|
||||
build/Depend.vcxproj.filters
|
||||
build/bin/Depend.lib
|
||||
build/bin/Depend.pdb
|
||||
build/obj/Win32/Release/CheatMenu/Animation.obj
|
||||
build/obj/Win32/Release/CheatMenu/CheatMenu.asi.recipe
|
||||
build/obj/Win32/Release/CheatMenu/CheatMenu.obj
|
||||
build/obj/Win32/Release/CheatMenu/CheatMenu.pch
|
||||
build/obj/Win32/Release/CheatMenu/Game.obj
|
||||
build/obj/Win32/Release/CheatMenu/Hook.obj
|
||||
build/obj/Win32/Release/CheatMenu/Json.obj
|
||||
build/obj/Win32/Release/CheatMenu/Menu.obj
|
||||
build/obj/Win32/Release/CheatMenu/MoreEvents.obj
|
||||
build/obj/Win32/Release/CheatMenu/Neon.obj
|
||||
build/obj/Win32/Release/CheatMenu/Paint.obj
|
||||
build/obj/Win32/Release/CheatMenu/pch.obj
|
||||
build/obj/Win32/Release/CheatMenu/Ped.obj
|
||||
build/obj/Win32/Release/CheatMenu/Player.obj
|
||||
build/obj/Win32/Release/CheatMenu/Teleport.obj
|
||||
build/obj/Win32/Release/CheatMenu/Ui.obj
|
||||
build/obj/Win32/Release/CheatMenu/Updater.obj
|
||||
build/obj/Win32/Release/CheatMenu/Util.obj
|
||||
build/obj/Win32/Release/CheatMenu/vc142.pdb
|
||||
build/obj/Win32/Release/CheatMenu/Vehicle.obj
|
||||
build/obj/Win32/Release/CheatMenu/Visual.obj
|
||||
build/obj/Win32/Release/CheatMenu/Weapon.obj
|
||||
build/obj/Win32/Release/CheatMenu/CheatMenu.tlog/CheatMenu.lastbuildstate
|
||||
build/obj/Win32/Release/CheatMenu/CheatMenu.tlog/CL.command.1.tlog
|
||||
build/obj/Win32/Release/CheatMenu/CheatMenu.tlog/CL.read.1.tlog
|
||||
build/obj/Win32/Release/CheatMenu/CheatMenu.tlog/CL.write.1.tlog
|
||||
build/obj/Win32/Release/CheatMenu/CheatMenu.tlog/link.command.1.tlog
|
||||
build/obj/Win32/Release/CheatMenu/CheatMenu.tlog/link.read.1.tlog
|
||||
build/obj/Win32/Release/CheatMenu/CheatMenu.tlog/link.write.1.tlog
|
||||
build/obj/Win32/Release/Depend/buffer.obj
|
||||
build/obj/Win32/Release/Depend/Depend.lib.recipe
|
||||
build/obj/Win32/Release/Depend/hde32.obj
|
||||
build/obj/Win32/Release/Depend/hook.obj
|
||||
build/obj/Win32/Release/Depend/IDaccess.obj
|
||||
build/obj/Win32/Release/Depend/imgui_demo.obj
|
||||
build/obj/Win32/Release/Depend/imgui_draw.obj
|
||||
build/obj/Win32/Release/Depend/imgui_impl_dx9.obj
|
||||
build/obj/Win32/Release/Depend/imgui_impl_dx11.obj
|
||||
build/obj/Win32/Release/Depend/imgui_impl_win32.obj
|
||||
build/obj/Win32/Release/Depend/imgui_tables.obj
|
||||
build/obj/Win32/Release/Depend/imgui_widgets.obj
|
||||
build/obj/Win32/Release/Depend/imgui.obj
|
||||
build/obj/Win32/Release/Depend/kiero.obj
|
||||
build/obj/Win32/Release/Depend/Library.obj
|
||||
build/obj/Win32/Release/Depend/Main.obj
|
||||
build/obj/Win32/Release/Depend/trampoline.obj
|
||||
build/obj/Win32/Release/Depend/Depend.tlog/CL.command.1.tlog
|
||||
build/obj/Win32/Release/Depend/Depend.tlog/CL.read.1.tlog
|
||||
build/obj/Win32/Release/Depend/Depend.tlog/CL.write.1.tlog
|
||||
build/obj/Win32/Release/Depend/Depend.tlog/Depend.lastbuildstate
|
||||
build/obj/Win32/Release/Depend/Depend.tlog/Lib-link.read.1.tlog
|
||||
build/obj/Win32/Release/Depend/Depend.tlog/Lib-link.write.1.tlog
|
||||
build/obj/Win32/Release/Depend/Depend.tlog/Lib.command.1.tlog
|
||||
build/
|
||||
|
15
.vscode/launch.json
vendored
15
.vscode/launch.json
vendored
@ -5,10 +5,21 @@
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "(Windows) Attach",
|
||||
"name": "Launch SA",
|
||||
"type": "cppvsdbg",
|
||||
"request": "launch",
|
||||
"program": "C:/Work/GTASanAndreas/gta_sa.exe",
|
||||
"args": [],
|
||||
"stopAtEntry": false,
|
||||
"cwd": "C:/Work/GTASanAndreas/",
|
||||
"environment": [],
|
||||
"console": "internalConsole"
|
||||
},
|
||||
{
|
||||
"name": "Attach",
|
||||
"type": "cppvsdbg",
|
||||
"request": "attach",
|
||||
"processId": "${command:pickProcess}"
|
||||
},
|
||||
}
|
||||
]
|
||||
}
|
70
.vscode/settings.json
vendored
70
.vscode/settings.json
vendored
@ -5,6 +5,74 @@
|
||||
"functional": "cpp",
|
||||
"memory": "cpp",
|
||||
"thread": "cpp",
|
||||
"xmemory": "cpp"
|
||||
"xmemory": "cpp",
|
||||
"iosfwd": "cpp",
|
||||
"array": "cpp",
|
||||
"atomic": "cpp",
|
||||
"bit": "cpp",
|
||||
"cctype": "cpp",
|
||||
"charconv": "cpp",
|
||||
"clocale": "cpp",
|
||||
"cmath": "cpp",
|
||||
"compare": "cpp",
|
||||
"concepts": "cpp",
|
||||
"condition_variable": "cpp",
|
||||
"cstddef": "cpp",
|
||||
"cstdint": "cpp",
|
||||
"cstdio": "cpp",
|
||||
"cstdlib": "cpp",
|
||||
"cstring": "cpp",
|
||||
"ctime": "cpp",
|
||||
"cwchar": "cpp",
|
||||
"exception": "cpp",
|
||||
"filesystem": "cpp",
|
||||
"format": "cpp",
|
||||
"forward_list": "cpp",
|
||||
"fstream": "cpp",
|
||||
"initializer_list": "cpp",
|
||||
"iomanip": "cpp",
|
||||
"ios": "cpp",
|
||||
"iostream": "cpp",
|
||||
"istream": "cpp",
|
||||
"iterator": "cpp",
|
||||
"limits": "cpp",
|
||||
"list": "cpp",
|
||||
"locale": "cpp",
|
||||
"map": "cpp",
|
||||
"mutex": "cpp",
|
||||
"new": "cpp",
|
||||
"numeric": "cpp",
|
||||
"optional": "cpp",
|
||||
"ostream": "cpp",
|
||||
"ratio": "cpp",
|
||||
"shared_mutex": "cpp",
|
||||
"sstream": "cpp",
|
||||
"stdexcept": "cpp",
|
||||
"stop_token": "cpp",
|
||||
"streambuf": "cpp",
|
||||
"string": "cpp",
|
||||
"system_error": "cpp",
|
||||
"tuple": "cpp",
|
||||
"type_traits": "cpp",
|
||||
"typeinfo": "cpp",
|
||||
"unordered_map": "cpp",
|
||||
"utility": "cpp",
|
||||
"valarray": "cpp",
|
||||
"vector": "cpp",
|
||||
"xfacet": "cpp",
|
||||
"xhash": "cpp",
|
||||
"xiosbase": "cpp",
|
||||
"xlocale": "cpp",
|
||||
"xlocbuf": "cpp",
|
||||
"xlocinfo": "cpp",
|
||||
"xlocmes": "cpp",
|
||||
"xlocmon": "cpp",
|
||||
"xlocnum": "cpp",
|
||||
"xloctime": "cpp",
|
||||
"xstddef": "cpp",
|
||||
"xstring": "cpp",
|
||||
"xtr1common": "cpp",
|
||||
"xtree": "cpp",
|
||||
"xutility": "cpp"
|
||||
}
|
||||
}
|
41
.vscode/tasks.json
vendored
Normal file
41
.vscode/tasks.json
vendored
Normal file
@ -0,0 +1,41 @@
|
||||
{
|
||||
// See https://go.microsoft.com/fwlink/?LinkId=733558
|
||||
// for the documentation about the tasks.json format
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"label": "Build Debug",
|
||||
"type": "shell",
|
||||
"command": "Debug.bat",
|
||||
"presentation": {
|
||||
"echo": true,
|
||||
"reveal": "always",
|
||||
"focus": false,
|
||||
"panel": "shared",
|
||||
"showReuseMessage": false,
|
||||
"clear": true
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "Build Release",
|
||||
"type": "shell",
|
||||
"command": "Release.bat",
|
||||
"presentation": {
|
||||
"echo": true,
|
||||
"reveal": "always",
|
||||
"focus": false,
|
||||
"panel": "shared",
|
||||
"showReuseMessage": false,
|
||||
"clear": true
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
6
Debug.bat
Normal file
6
Debug.bat
Normal file
@ -0,0 +1,6 @@
|
||||
@echo off
|
||||
premake5.exe vs2019
|
||||
cd build
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat"
|
||||
MsBuild CheatMenu.sln /property:Configuration=Debug
|
||||
cd ..
|
@ -4,7 +4,7 @@
|
||||
Required:
|
||||
DirectX 9 SDK
|
||||
Plugin SDK
|
||||
Visual Studio 2019 (v142)
|
||||
Build Tools 2019 (v142)
|
||||
Windows SDK
|
||||
*/
|
||||
|
||||
|
24
src/Ui.cpp
24
src/Ui.cpp
@ -530,10 +530,22 @@ void Ui::DrawImages(std::vector<std::unique_ptr<STextureStructure>>& img_vec, Im
|
||||
&& (verify_func == nullptr || verify_func(text))
|
||||
)
|
||||
{
|
||||
IDirect3DTexture9* texture = (IDirect3DTexture9*)Util::GetTextureFromRaster(img_vec[i]->m_pRwTexture);
|
||||
if (ImGui::ImageButton(texture, image_size, ImVec2(0, 0), ImVec2(1, 1), 1, ImVec4(1, 1, 1, 1),
|
||||
ImVec4(1, 1, 1, 1)))
|
||||
if (Globals::renderer == Render_DirectX11)
|
||||
{
|
||||
if (ImGui::MenuItem(model_name.c_str()))
|
||||
{
|
||||
on_left_click(text);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
IDirect3DTexture9* texture = (IDirect3DTexture9*)Util::GetTextureFromRaster(img_vec[i]->m_pRwTexture);
|
||||
if (ImGui::ImageButton(texture, image_size, ImVec2(0, 0), ImVec2(1, 1), 1, ImVec4(1, 1, 1, 1),ImVec4(1, 1, 1, 1)))
|
||||
{
|
||||
on_left_click(text);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (ImGui::IsItemClicked(1) && on_right_click != nullptr)
|
||||
{
|
||||
@ -541,6 +553,8 @@ void Ui::DrawImages(std::vector<std::unique_ptr<STextureStructure>>& img_vec, Im
|
||||
imgPopup.value = model_name;
|
||||
}
|
||||
|
||||
if (Globals::renderer != Render_DirectX11)
|
||||
{
|
||||
if (ImGui::IsItemHovered())
|
||||
{
|
||||
ImDrawList* drawlist = ImGui::GetWindowDrawList();
|
||||
@ -576,8 +590,10 @@ void Ui::DrawImages(std::vector<std::unique_ptr<STextureStructure>>& img_vec, Im
|
||||
}
|
||||
|
||||
if (images_count % images_in_row != 0)
|
||||
{
|
||||
ImGui::SameLine(0.0, ImGui::GetStyle().ItemInnerSpacing.x);
|
||||
|
||||
}
|
||||
}
|
||||
images_count++;
|
||||
}
|
||||
}
|
||||
|
@ -1028,6 +1028,8 @@ void Vehicle::Draw()
|
||||
ImGui::EndChild();
|
||||
ImGui::EndTabItem();
|
||||
}
|
||||
if (Globals::renderer != Render_DirectX11)
|
||||
{
|
||||
if (ImGui::BeginTabItem("Neons"))
|
||||
{
|
||||
ImGui::Spacing();
|
||||
@ -1047,7 +1049,7 @@ void Vehicle::Draw()
|
||||
Ui::CheckboxWithHint("Rainbow neons", &m_Neon::m_bRainbowEffect, "Rainbow effect to neon lights");
|
||||
ImGui::NextColumn();
|
||||
Ui::CheckboxWithHint("Traffic neons", &m_Neon::m_bApplyOnTraffic, "Adds neon lights to traffic vehicles.\n\
|
||||
Only some vehicles will have them.");
|
||||
Only some vehicles will have them.");
|
||||
ImGui::Columns(1);
|
||||
|
||||
ImGui::Spacing();
|
||||
@ -1136,6 +1138,7 @@ Only some vehicles will have them.");
|
||||
|
||||
ImGui::EndTabItem();
|
||||
}
|
||||
}
|
||||
if (ImGui::BeginTabItem("Tune"))
|
||||
{
|
||||
ImGui::Spacing();
|
||||
|
Loading…
Reference in New Issue
Block a user