cafeberry/4JLibs
5
0 Fork 1
Code Pull Requests Activity

chore: cleanup

Browse Source
This commit is contained in:
str1k3r committed 2026-10-25 17:00:03 -04:00
1 parent f7f0619c39
commit bfa635f781
11 files changed
+221 -180
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

4J_Input/4J_Input.vcxproj
+6 -2
View File
@@ -1339,25 +1339,29 @@
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">
<PlatformToolset>Clang</PlatformToolset>
<TrackFileAccess>false</TrackFileAccess>
<ConfigurationType>StaticLibrary</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
<PlatformToolset>SNC</PlatformToolset>
<TrackFileAccess>false</TrackFileAccess>
<ConfigurationType>StaticLibrary</ConfigurationType>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">
<PlatformToolset>Clang</PlatformToolset>
<TrackFileAccess>false</TrackFileAccess>
<ConfigurationType>StaticLibrary</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
<PlatformToolset>SNC</PlatformToolset>
<TrackFileAccess>false</TrackFileAccess>
<ConfigurationType>StaticLibrary</ConfigurationType>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
4J_Input/PS3/INP_Main.cpp
+14 -22
View File
@@ -1,12 +1,5 @@
#include "INP_Main.h"
#include <stdlib.h>
#include <stdio.h>
#include <sys/sys_time.h> // sys_time_get_current_time
#include <sysutil/sysutil_common.h> // cellSysutilGetSystemParamInt
#include <sysutil/sysutil_sysparam.h> // cellSysutilGetSystemParamInt
CInput InternalInputManager;
CInput::CInput()
@@ -47,20 +40,21 @@ void CInput::DebugPrintf(const char *szFormat, ...)
printf(buf);
}
bool CInput::QueryPerformanceFrequency(_LARGE_INTEGER *)
//str1k3r - Taken from Ps3Stubs.cpp
bool CInput::QueryPerformanceFrequency(LARGE_INTEGER *lpFrequency)
{
#if TO_BE_IMPLEMENTED
*(_QWORD *)a2 = 1000000;
#endif
// microseconds
lpFrequency->QuadPart = (1000 * 1000);
return false;
}
bool CInput::QueryPerformanceCounter(_LARGE_INTEGER *)
bool CInput::QueryPerformanceCounter(LARGE_INTEGER *lpPerformanceCount)
{
#if TO_BE_IMPLEMENTED
sys_time_get_current_time(&v3, &v4);
*(_QWORD *)a2 = 1000000 * v3 + v4 / 1000;
#endif
sys_time_sec_t sec;
sys_time_nsec_t nsec;
sys_time_get_current_time(&sec, &nsec);
// microseconds
lpPerformanceCount->QuadPart = (sec * (1000 * 1000)) + (nsec / 1000);
return true;
}
@@ -704,12 +698,10 @@ FLOAT CInput::GetIdleSeconds(int iPad)
{
LARGE_INTEGER qwDeltaTime;
QueryPerformanceCounter(&qwDeltaTime);
#if TO_BE_IMPLEMENTED
uint64_t v4 = qwDeltaTime.QuadPart - *(_QWORD *)(v5 + 4696 + 8 * a2);
return (float)(*(float *)((char *)&loc_644 + v5) * (float)v4)
#else
return 0.0f;
#endif
LARGE_INTEGER fElapsedTime = this->m_LastActivityTime[iPad];
return this->m_fTickToSeconds * (qwDeltaTime.LowPart - fElapsedTime.LowPart);
}
void CInput::SetLostInputControlCallback(void( *Func)(LPVOID, bool),LPVOID lpParam)
4J_Input/PS3/INP_Main.h
-2
View File
@@ -4,8 +4,6 @@
#include "INP_OnScreenKeyboard.h"
#include "INP_MsgBox.h"
#include <cell/pad.h>
#define MAX_JOYPADS 4
class CInput
4J_Input/PS3/INP_MsgBox.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "4J_Input.h"
#include <sysutil/sysutil_msgdialog.h> // cellMsgDialogOpen2
class CMsgBox
{
4J_Input/PS3/INP_OnScreenKeyboard.h
-5
View File
@@ -1,11 +1,6 @@
#pragma once
#include "4J_Input.h"
#include <sysutil/sysutil_common.h> // cellSysutilRegisterCallback
#include <sysutil/sysutil_oskdialog.h > // cellOskDialogUnloadAsync
#include <sysutil/sysutil_oskdialog_ext.h> // cellOskDialogExtRegisterKeyboardEventHookCallback
#include <sysutil/sysutil_sysparam.h> // cellSysutilGetSystemParamInt
#include <cell/sysmodule.h> // SYS_MEMORY_CONTAINER_ID_INVALID
class CKeyboard
{
4J_Input/Windows64/INP_Main.cpp
-1
View File
@@ -646,7 +646,6 @@ FLOAT CInput::GetIdleSeconds(int iPad)
QueryPerformanceCounter(&qwDeltaTime);
LARGE_INTEGER fElapsedTime = this->m_LastActivityTime[iPad];
uint64_t qwNewTime = qwDeltaTime.QuadPart - fElapsedTime.QuadPart;
return this->m_fTickToSeconds * (qwDeltaTime.LowPart - fElapsedTime.LowPart);
}
4J_Input/Xbox/INP_Main.cpp
-1
View File
@@ -556,7 +556,6 @@ FLOAT CInput::GetIdleSeconds(int iPad)
QueryPerformanceCounter(&qwDeltaTime);
LARGE_INTEGER fElapsedTime = this->m_LastActivityTime[iPad];
uint64_t qwNewTime = qwDeltaTime.QuadPart - fElapsedTime.QuadPart;
return this->m_fTickToSeconds * (qwDeltaTime.LowPart - fElapsedTime.LowPart);
}
4J_Input/stdafx.h
+22 -14
View File
@@ -1,35 +1,43 @@
#ifndef PCH_H
#define PCH_H
//str1k3r - These top ones are shared across platforms
#include <assert.h>
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#ifdef _WIN64
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <cstdint>
#include <assert.h>
#endif
#ifdef __ORBIS__
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
#include <scebase.h>
#include <kernel.h>
#include "OrbisTypes.h"
#include "4J_Profile.h"
#include <pad.h>
#include <fios2.h>
#include <kernel.h>
#include <stdarg.h>
#include <scebase.h>
#include <message_dialog.h>
#endif
#ifdef _XBOX
#include <xtl.h>
#include <stdint.h>
#include <assert.h>
#include "4J_Storage.h"
#else
#include "extraX64.h"
#endif
#ifdef __PS3__
#include "Ps3Types.h"
#include "PS3Types.h"
#include <cell/pad.h>
#include <sys/sys_time.h>
#include <cell/sysmodule.h>
#include <sysutil/sysutil_common.h>
#include <sysutil/sysutil_sysparam.h>
#include <sysutil/sysutil_sysparam.h>
#include <sysutil/sysutil_msgdialog.h>
#include <sysutil/sysutil_oskdialog.h>
#include <sysutil/sysutil_oskdialog_ext.h>
#endif
#endif //PCH_H