Skip to content

Commit dbe517f

Browse files
committed
added scene manager teleport menu and in progress item spwaner
1 parent 14dfe35 commit dbe517f

File tree

222 files changed

+1627
-1289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+1627
-1289
lines changed

app/src/main/cpp/CMakeLists.txt

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,51 @@
33

44
# Sets the minimum version of CMake required to build the native library.
55

6-
cmake_minimum_required(VERSION 3.10.2)
6+
cmake_minimum_required(VERSION 3.4.1)
7+
78

89
# Declares and names the project.
910

10-
project("NoxTeam")
11+
project("NaVi")
1112
# Creates and names a library, sets it as either STATIC
1213
# or SHARED, and provides the relative paths to its source code.
1314
# You can define multiple libraries, and CMake builds them for you.
1415
# Gradle automatically packages shared libraries with your APK.
15-
add_library( # Sets the name of the library.
1616

17-
NoxTeam
17+
set(DobbyHome Dobby-master)
18+
include_directories(
19+
${DobbyHome}/include
20+
)
21+
macro(SET_OPTION option value)
22+
set(${option} ${value} CACHE INTERNAL "" FORCE)
23+
endmacro()
24+
SET_OPTION(DOBBY_GENERATE_SHARED OFF)
25+
add_subdirectory(${DobbyHome} dobby)
26+
27+
set(C_FLAGS "${C_FLAGS} -O2 -fvisibility=hidden -fvisibility-inlines-hidden")
28+
set(LINKER_FLAGS "${LINKER_FLAGS} -Wl,-exclude-libs,ALL -Wl,--gc-sections -Wl,--strip-all")
1829

30+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_FLAGS}")
31+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${C_FLAGS} ${CXX_FLAGS}")
32+
33+
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}")
34+
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
35+
36+
add_library( # Sets the name of the library.
37+
NaVi
1938
# Sets the library as a shared library.
2039
SHARED
21-
2240
# Provides a relative path to your source file(s).
2341
native-lib.cpp
24-
imgui_impl_android.cpp
25-
imgui/imgui.cpp
26-
imgui/imgui_demo.cpp
27-
imgui/imgui_draw.cpp
28-
imgui/imgui_tables.cpp
29-
imgui/imgui_widgets.cpp
42+
43+
ImGui_Impl_AndroidOpenGL2.cpp
44+
ImGui/imgui.cpp
45+
ImGui/imgui_demo.cpp
46+
ImGui/imgui_draw.cpp
47+
ImGui/imgui_tables.cpp
48+
ImGui/imgui_widgets.cpp
49+
50+
#Cydia Substrate
3051
Substrate/SubstrateDebug.cpp
3152
Substrate/SubstrateHook.cpp
3253
Substrate/SubstratePosixMemory.cpp
@@ -38,24 +59,13 @@ add_library( # Sets the name of the library.
3859
# default, you only need to specify the name of the public NDK library
3960
# you want to add. CMake verifies that the library exists before
4061
# completing its build.
41-
42-
find_library( # Sets the name of the path variable.
43-
log-lib
44-
45-
# Specifies the name of the NDK library that
46-
# you want CMake to locate.
47-
log)
48-
4962
# Specifies libraries CMake should link to your target library. You
5063
# can link multiple libraries, such as libraries you define in this
5164
# build script, prebuilt third-party libraries, or system libraries.
5265
target_link_libraries( # Specifies the target library.
53-
NoxTeam
54-
-landroid
55-
EGL
56-
GLESv2
66+
NaVi
67+
android
68+
log
69+
EGL
5770
GLESv3
58-
GLESv1_CM
59-
# Links the target library to the log library
60-
# included in the NDK.
61-
${log-lib})
71+
dobby)
File renamed without changes.
File renamed without changes.
File renamed without changes.

app/src/main/cpp/imgui/examples/example_android_opengl3/android/app/src/main/AndroidManifest.xml renamed to app/src/main/cpp/ImGui/examples/example_android_opengl3/android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="imgui.example.android">
3+
package="ImGui.example.android">
44

55
<application
66
android:label="ImGuiExample"
@@ -9,7 +9,7 @@
99
android:hasCode="true">
1010

1111
<activity
12-
android:name="imgui.example.android.MainActivity"
12+
android:name="ImGui.example.android.MainActivity"
1313
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
1414
android:configChanges="orientation|keyboardHidden|screenSize">
1515
<meta-data android:name="android.app.lib_name"

app/src/main/cpp/imgui/examples/example_android_opengl3/android/app/src/main/java/MainActivity.kt renamed to app/src/main/cpp/ImGui/examples/example_android_opengl3/android/app/src/main/java/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package imgui.example.android
1+
package ImGui.example.android
22

33
import android.app.NativeActivity
44
import android.os.Bundle
File renamed without changes.

app/src/main/cpp/imgui/imgui.cpp renamed to app/src/main/cpp/ImGui/imgui.cpp

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,36 @@ ImGuiStyle::ImGuiStyle()
10401040
ImGui::StyleColorsDark(this);
10411041
}
10421042

1043+
1044+
// To scale your entire UI (e.g. if you want your app to use High DPI or generally be DPI aware) you may use this helper function. Scaling the fonts is done separately and is up to you.
1045+
// Important: This operation is lossy because we round all sizes to integer. If you need to change your scale multiples, call this over a freshly initialized ImGuiStyle structure rather than scaling multiple times.
1046+
void ImGuiStyle::ResetAllSizes()
1047+
{
1048+
WindowPadding = ImVec2(8,8);
1049+
WindowRounding = 0.0f;
1050+
WindowMinSize = ImVec2(32,32);
1051+
ChildRounding = 0.0f;
1052+
PopupRounding = 0.0f;
1053+
FramePadding = ImVec2(4,3);
1054+
FrameRounding = 0.0f;
1055+
ItemSpacing = ImVec2(8,4);
1056+
ItemInnerSpacing = ImVec2(4,4);
1057+
CellPadding = ImVec2(4,2);
1058+
TouchExtraPadding = ImVec2(0,0);
1059+
IndentSpacing = 21.0f;
1060+
ColumnsMinSpacing = 6.0f;
1061+
ScrollbarSize = 14.0f;
1062+
ScrollbarRounding = 9.0f;
1063+
GrabMinSize = 10.0f;
1064+
GrabRounding = 0.0f;
1065+
LogSliderDeadzone = 4.0f;
1066+
TabRounding = 4.0f;
1067+
TabMinWidthForCloseButton = 0.0f;
1068+
DisplayWindowPadding = ImVec2(19,19);
1069+
DisplaySafeAreaPadding = ImVec2(3,3);
1070+
MouseCursorScale = 1.0f;
1071+
}
1072+
10431073
// To scale your entire UI (e.g. if you want your app to use High DPI or generally be DPI aware) you may use this helper function. Scaling the fonts is done separately and is up to you.
10441074
// Important: This operation is lossy because we round all sizes to integer. If you need to change your scale multiples, call this over a freshly initialized ImGuiStyle structure rather than scaling multiple times.
10451075
void ImGuiStyle::ScaleAllSizes(float scale_factor)

app/src/main/cpp/imgui/imgui.h renamed to app/src/main/cpp/ImGui/imgui.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1818,6 +1818,7 @@ struct ImGuiStyle
18181818

18191819
IMGUI_API ImGuiStyle();
18201820
IMGUI_API void ScaleAllSizes(float scale_factor);
1821+
IMGUI_API void ResetAllSizes();
18211822
};
18221823

18231824
//-----------------------------------------------------------------------------

app/src/main/cpp/imgui/imgui_widgets.cpp renamed to app/src/main/cpp/ImGui/imgui_widgets.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6377,7 +6377,7 @@ bool ImGui::BeginListBox(const char* label, const ImVec2& size_arg)
63776377
window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, label_pos + label_size);
63786378
}
63796379

6380-
BeginChildFrame(id, frame_bb.GetSize());
6380+
BeginChildFrame(id, frame_bb.GetSize(), ImGuiWindowFlags_NoBackground);
63816381
return true;
63826382
}
63836383

0 commit comments

Comments
 (0)