mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-15 21:40:45 +00:00
get rid of the '¯' chars in source code...non ascii chars are not really good to have floating around for no reason. http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Non-ASCII_Characters#Non-ASCII_Characters
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4231 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
463e93c41a
commit
3b76f6dc80
@ -96,7 +96,7 @@ void CMixer::PushSamples(short *samples, int num_stereo_samples, int core_sample
|
|||||||
|
|
||||||
// -----------------------------------------------------------------------
|
// -----------------------------------------------------------------------
|
||||||
// The auto throttle function. This loop will put a ceiling on the CPU MHz.
|
// The auto throttle function. This loop will put a ceiling on the CPU MHz.
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッッッッッッ
|
// ----------------------------
|
||||||
/* This is only needed for non-AX sound, currently directly
|
/* This is only needed for non-AX sound, currently directly
|
||||||
streamed and DTK sound. For AX we call SoundStream::Update in
|
streamed and DTK sound. For AX we call SoundStream::Update in
|
||||||
AXTask() for example. */
|
AXTask() for example. */
|
||||||
|
@ -185,7 +185,7 @@ void ConsoleListener::PixelSpace(int Left, int Top, int Width, int Height, bool
|
|||||||
|
|
||||||
// ---------------------------------------------------------------------
|
// ---------------------------------------------------------------------
|
||||||
// Save the current text
|
// Save the current text
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッッ
|
// ------------------------
|
||||||
DWORD cCharsRead = 0;
|
DWORD cCharsRead = 0;
|
||||||
COORD coordScreen = { 0, 0 };
|
COORD coordScreen = { 0, 0 };
|
||||||
|
|
||||||
|
@ -201,7 +201,7 @@ std::string Timer::GetTimeFormatted()
|
|||||||
|
|
||||||
|
|
||||||
// Returns a timestamp with decimals for precise time comparisons
|
// Returns a timestamp with decimals for precise time comparisons
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
double Timer::GetDoubleTime()
|
double Timer::GetDoubleTime()
|
||||||
{
|
{
|
||||||
struct timeb tp;
|
struct timeb tp;
|
||||||
|
@ -697,7 +697,7 @@ void Callback_VideoCopiedToXFB(bool video_update)
|
|||||||
no_framelimit--;
|
no_framelimit--;
|
||||||
|
|
||||||
// Custom frame limiter
|
// Custom frame limiter
|
||||||
// ッッッッッッッッッッッッッッッッッッッッ
|
// --------------------
|
||||||
u32 targetfps = SConfig::GetInstance().m_Framelimit * 5;
|
u32 targetfps = SConfig::GetInstance().m_Framelimit * 5;
|
||||||
|
|
||||||
if (targetfps > 5)
|
if (targetfps > 5)
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッッッッッッ
|
// --------------
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
@ -66,7 +66,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// File description: Rerecording Functions
|
// File description: Rerecording Functions
|
||||||
/* ッッッッッッッッッッッッッッッ
|
/* ---------------
|
||||||
|
|
||||||
How the timer works: We measure the time between drawn frames, not when the game is paused. So time
|
How the timer works: We measure the time between drawn frames, not when the game is paused. So time
|
||||||
should be a fairly comparable measure of the time it took to play the game. However the time it takes
|
should be a fairly comparable measure of the time it took to play the game. However the time it takes
|
||||||
@ -85,7 +85,7 @@ namespace Core
|
|||||||
|
|
||||||
|
|
||||||
// Declarations and definitions
|
// Declarations and definitions
|
||||||
// ッッッッッッッッッッッッッッッ
|
// ---------------
|
||||||
int g_FrameCounter = 0;
|
int g_FrameCounter = 0;
|
||||||
bool g_FrameStep = false;
|
bool g_FrameStep = false;
|
||||||
Common::Timer ReRecTimer;
|
Common::Timer ReRecTimer;
|
||||||
@ -94,7 +94,7 @@ Common::Timer ReRecTimer;
|
|||||||
|
|
||||||
|
|
||||||
// Control Run, Pause, Stop and the Timer.
|
// Control Run, Pause, Stop and the Timer.
|
||||||
// ッッッッッッッッッッッッッッッ
|
// ---------------
|
||||||
|
|
||||||
// Subtract the paused time when we run again
|
// Subtract the paused time when we run again
|
||||||
void Run()
|
void Run()
|
||||||
@ -165,7 +165,7 @@ void WindBack(int Counter)
|
|||||||
|
|
||||||
|
|
||||||
// Frame advance
|
// Frame advance
|
||||||
// ッッッッッッッッッッッッッッッ
|
// ---------------
|
||||||
void FrameAdvance()
|
void FrameAdvance()
|
||||||
{
|
{
|
||||||
// Update status bar
|
// Update status bar
|
||||||
@ -207,7 +207,7 @@ void FrameStepOnOff()
|
|||||||
|
|
||||||
|
|
||||||
// General functions
|
// General functions
|
||||||
// ッッッッッッッッッッッッッッッ
|
// ---------------
|
||||||
|
|
||||||
// Write to the status bar
|
// Write to the status bar
|
||||||
void WriteStatus()
|
void WriteStatus()
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// File description
|
// File description
|
||||||
/* ッッッッッッッッッッッッ
|
/* ------------
|
||||||
|
|
||||||
This file controls when plugins are loaded and unloaded from memory. Its functions scan for valid
|
This file controls when plugins are loaded and unloaded from memory. Its functions scan for valid
|
||||||
plugins when Dolphin is booted, and open the debugging and config windows. The PluginManager is
|
plugins when Dolphin is booted, and open the debugging and config windows. The PluginManager is
|
||||||
@ -27,7 +27,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッッッッ
|
// ------------
|
||||||
#include <string> // System
|
#include <string> // System
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
@ -51,7 +51,7 @@ CPluginManager CPluginManager::m_Instance;
|
|||||||
|
|
||||||
|
|
||||||
// The Plugin Manager Class
|
// The Plugin Manager Class
|
||||||
// ッッッッッッッッッッッッ
|
// ------------
|
||||||
|
|
||||||
// The plugin manager is some sort of singleton that runs during Dolphin's entire lifespan.
|
// The plugin manager is some sort of singleton that runs during Dolphin's entire lifespan.
|
||||||
CPluginManager::CPluginManager()
|
CPluginManager::CPluginManager()
|
||||||
@ -103,7 +103,7 @@ CPluginManager::~CPluginManager()
|
|||||||
|
|
||||||
|
|
||||||
// Init and Shutdown Plugins
|
// Init and Shutdown Plugins
|
||||||
// ッッッッッッッッッッッッ
|
// ------------
|
||||||
// Function: Point the m_pad[] and other variables to a certain plugin
|
// Function: Point the m_pad[] and other variables to a certain plugin
|
||||||
bool CPluginManager::InitPlugins()
|
bool CPluginManager::InitPlugins()
|
||||||
{
|
{
|
||||||
@ -202,7 +202,7 @@ void CPluginManager::ShutdownVideoPlugin()
|
|||||||
|
|
||||||
|
|
||||||
// The PluginInfo class: Find Valid Plugins
|
// The PluginInfo class: Find Valid Plugins
|
||||||
// ッッッッッッッッッッッッ
|
// ------------
|
||||||
/* Function: This info is used in ScanForPlugins() to check for valid plugins and and in LoadPlugin() to
|
/* Function: This info is used in ScanForPlugins() to check for valid plugins and and in LoadPlugin() to
|
||||||
check that the filename we want to use is a good DLL. */
|
check that the filename we want to use is a good DLL. */
|
||||||
CPluginInfo::CPluginInfo(const char *_rFilename)
|
CPluginInfo::CPluginInfo(const char *_rFilename)
|
||||||
@ -234,7 +234,7 @@ CPluginInfo::CPluginInfo(const char *_rFilename)
|
|||||||
|
|
||||||
|
|
||||||
// Supporting functions
|
// Supporting functions
|
||||||
// ッッッッッッッッッッッッ
|
// ------------
|
||||||
|
|
||||||
/* Return the plugin info we saved when Dolphin was started. We don't even add a function to try load a
|
/* Return the plugin info we saved when Dolphin was started. We don't even add a function to try load a
|
||||||
plugin name that was not found because in that case it must have been deleted while Dolphin was running.
|
plugin name that was not found because in that case it must have been deleted while Dolphin was running.
|
||||||
@ -380,7 +380,7 @@ void CPluginManager::ScanForPlugins()
|
|||||||
We don't need to check if [Plugin]->IsValid() here because it will not be set by LoadPlugin()
|
We don't need to check if [Plugin]->IsValid() here because it will not be set by LoadPlugin()
|
||||||
if it's not valid.
|
if it's not valid.
|
||||||
*/
|
*/
|
||||||
// ッッッッッッッッッッッッ
|
// ------------
|
||||||
Common::PluginPAD *CPluginManager::GetPad(int controller)
|
Common::PluginPAD *CPluginManager::GetPad(int controller)
|
||||||
{
|
{
|
||||||
if (m_pad[controller] != NULL)
|
if (m_pad[controller] != NULL)
|
||||||
@ -478,7 +478,7 @@ void CPluginManager::FreeWiimote(u32 Wiimote)
|
|||||||
|
|
||||||
|
|
||||||
// Call DLL functions
|
// Call DLL functions
|
||||||
// ッッッッッッッッッッッッ
|
// ------------
|
||||||
|
|
||||||
// Open config window. Input: _rFilename = Plugin filename , Type = Plugin type
|
// Open config window. Input: _rFilename = Plugin filename , Type = Plugin type
|
||||||
void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename, PLUGIN_TYPE Type)
|
void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename, PLUGIN_TYPE Type)
|
||||||
|
@ -30,14 +30,14 @@
|
|||||||
|
|
||||||
|
|
||||||
// Settings
|
// Settings
|
||||||
// ッッッッッッッッッッ
|
// ----------
|
||||||
#define JIT_OFF_OPTIONS // Compile with JIT off options
|
#define JIT_OFF_OPTIONS // Compile with JIT off options
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッッ
|
// ----------
|
||||||
#if JITTEST
|
#if JITTEST
|
||||||
#include "../Jit64IL/Jit.h"
|
#include "../Jit64IL/Jit.h"
|
||||||
#else
|
#else
|
||||||
@ -59,7 +59,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Declarations and definitions
|
// Declarations and definitions
|
||||||
// ッッッッッッッッッッ
|
// ----------
|
||||||
|
|
||||||
void Jit(u32 em_address);
|
void Jit(u32 em_address);
|
||||||
|
|
||||||
|
@ -179,7 +179,7 @@ void CBreakPointWindow::OnActivated(wxListEvent& event)
|
|||||||
|
|
||||||
|
|
||||||
// Breakpoint actions
|
// Breakpoint actions
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
|
|
||||||
// Clear all breakpoints
|
// Clear all breakpoints
|
||||||
void CBreakPointWindow::OnClear(wxCommandEvent& event)
|
void CBreakPointWindow::OnClear(wxCommandEvent& event)
|
||||||
@ -233,7 +233,7 @@ void CBreakPointWindow::OnAddBreakPointMany(wxCommandEvent& event)
|
|||||||
|
|
||||||
|
|
||||||
// Memory check actions
|
// Memory check actions
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
void
|
void
|
||||||
CBreakPointWindow::OnAddMemoryCheck(wxCommandEvent& event)
|
CBreakPointWindow::OnAddMemoryCheck(wxCommandEvent& event)
|
||||||
{
|
{
|
||||||
|
@ -700,7 +700,7 @@ void CCodeWindow::UpdateButtonStates()
|
|||||||
wxAuiToolBar* ToolBar = GetToolBar();
|
wxAuiToolBar* ToolBar = GetToolBar();
|
||||||
|
|
||||||
// Toolbar
|
// Toolbar
|
||||||
// ッッッッッッッッッッッッッッッッッッ
|
// ------------------
|
||||||
if (!ToolBar) return;
|
if (!ToolBar) return;
|
||||||
|
|
||||||
if (!Initialized)
|
if (!Initialized)
|
||||||
@ -736,7 +736,7 @@ void CCodeWindow::UpdateButtonStates()
|
|||||||
if (ToolBar) ToolBar->Realize();
|
if (ToolBar) ToolBar->Realize();
|
||||||
|
|
||||||
// Menu bar
|
// Menu bar
|
||||||
// ッッッッッッッッッッッッッッッッッッ
|
// ------------------
|
||||||
GetMenuBar()->Enable(IDM_INTERPRETER, Pause); // CPU Mode
|
GetMenuBar()->Enable(IDM_INTERPRETER, Pause); // CPU Mode
|
||||||
|
|
||||||
GetMenuBar()->Enable(IDM_JITUNLIMITED, !Initialized);
|
GetMenuBar()->Enable(IDM_JITUNLIMITED, !Initialized);
|
||||||
|
@ -92,7 +92,7 @@ class CCodeWindow
|
|||||||
void UpdateManager();
|
void UpdateManager();
|
||||||
|
|
||||||
// Menu bar
|
// Menu bar
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
void OnCPUMode(wxCommandEvent& event); // CPU Mode menu
|
void OnCPUMode(wxCommandEvent& event); // CPU Mode menu
|
||||||
void OnJITOff(wxCommandEvent& event);
|
void OnJITOff(wxCommandEvent& event);
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// --------------
|
||||||
#include "Common.h"
|
#include "Common.h"
|
||||||
|
|
||||||
#include <wx/button.h>
|
#include <wx/button.h>
|
||||||
@ -80,7 +80,7 @@ extern "C" // Bitmaps
|
|||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// Save and load settings
|
// Save and load settings
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// -----------------------------
|
||||||
void CCodeWindow::Load()
|
void CCodeWindow::Load()
|
||||||
{
|
{
|
||||||
IniFile ini;
|
IniFile ini;
|
||||||
@ -194,7 +194,7 @@ void CCodeWindow::Save()
|
|||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// Symbols, JIT, Profiler
|
// Symbols, JIT, Profiler
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// ----------------
|
||||||
void CCodeWindow::CreateMenuSymbols()
|
void CCodeWindow::CreateMenuSymbols()
|
||||||
{
|
{
|
||||||
wxMenu *pSymbolsMenu = new wxMenu;
|
wxMenu *pSymbolsMenu = new wxMenu;
|
||||||
@ -443,7 +443,7 @@ void CCodeWindow::OnChangeFont(wxCommandEvent& event)
|
|||||||
|
|
||||||
|
|
||||||
// Toogle windows
|
// Toogle windows
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// ----------------
|
||||||
|
|
||||||
void CCodeWindow::OpenPages()
|
void CCodeWindow::OpenPages()
|
||||||
{
|
{
|
||||||
|
@ -172,7 +172,7 @@ bool BootCore(const std::string& _rFilename)
|
|||||||
|
|
||||||
// =================================================================
|
// =================================================================
|
||||||
// Run the game
|
// Run the game
|
||||||
// ッッッッッッッッッッッッッッ
|
// --------------
|
||||||
#if defined(HAVE_WX) && HAVE_WX
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
if(main_frame)
|
if(main_frame)
|
||||||
{
|
{
|
||||||
|
@ -85,7 +85,7 @@ class CFrame : public wxFrame
|
|||||||
|
|
||||||
// ---------------------------------------
|
// ---------------------------------------
|
||||||
// Wiimote leds
|
// Wiimote leds
|
||||||
// ッッッッッッッッッッッッッッッッッッッッ
|
// --------------------
|
||||||
void ModifyStatusBar();
|
void ModifyStatusBar();
|
||||||
void CreateDestroy(int Case);
|
void CreateDestroy(int Case);
|
||||||
void CreateLeds(); void CreateSpeakers();
|
void CreateLeds(); void CreateSpeakers();
|
||||||
|
@ -177,7 +177,7 @@ void CFrame::ToggleConsole(bool bShow, int i)
|
|||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// Notebooks
|
// Notebooks
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
void CFrame::ClosePages()
|
void CFrame::ClosePages()
|
||||||
{
|
{
|
||||||
DoToggleWindow(IDM_LOGWINDOW, false);
|
DoToggleWindow(IDM_LOGWINDOW, false);
|
||||||
@ -665,7 +665,7 @@ void CFrame::OnDropDownToolbarSelect(wxCommandEvent& event)
|
|||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// Functions
|
// Functions
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
void CFrame::ResetToolbarStyle()
|
void CFrame::ResetToolbarStyle()
|
||||||
{
|
{
|
||||||
wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes();
|
wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes();
|
||||||
@ -750,7 +750,7 @@ void CFrame::ResizeConsole()
|
|||||||
|
|
||||||
// ----------------------------------------------------------
|
// ----------------------------------------------------------
|
||||||
// Get OS version
|
// Get OS version
|
||||||
// ッッッッッッッッッッッッッッッッッッ
|
// ------------------
|
||||||
int wxBorder, Border, LowerBorder, MenuBar, ScrollBar, WidthReduction;
|
int wxBorder, Border, LowerBorder, MenuBar, ScrollBar, WidthReduction;
|
||||||
OSVERSIONINFO osvi;
|
OSVERSIONINFO osvi;
|
||||||
ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
|
ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
|
||||||
@ -1066,7 +1066,7 @@ void CFrame::AddPane()
|
|||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// Utility
|
// Utility
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
|
|
||||||
int CFrame::Limit(int i, int Low, int High)
|
int CFrame::Limit(int i, int Low, int High)
|
||||||
{
|
{
|
||||||
|
@ -95,7 +95,7 @@ wxInfoWindow* InfoWindow;
|
|||||||
|
|
||||||
|
|
||||||
// Create menu items
|
// Create menu items
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
void CFrame::CreateMenu()
|
void CFrame::CreateMenu()
|
||||||
{
|
{
|
||||||
if (GetMenuBar()) GetMenuBar()->Destroy();
|
if (GetMenuBar()) GetMenuBar()->Destroy();
|
||||||
@ -254,7 +254,7 @@ void CFrame::CreateMenu()
|
|||||||
|
|
||||||
|
|
||||||
// Create toolbar items
|
// Create toolbar items
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar)
|
void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar)
|
||||||
{
|
{
|
||||||
int w = m_Bitmaps[Toolbar_FileOpen].GetWidth(),
|
int w = m_Bitmaps[Toolbar_FileOpen].GetWidth(),
|
||||||
@ -434,7 +434,7 @@ void CFrame::InitBitmaps()
|
|||||||
|
|
||||||
|
|
||||||
// Menu items
|
// Menu items
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
|
|
||||||
// Start the game or change the disc
|
// Start the game or change the disc
|
||||||
void CFrame::BootGame()
|
void CFrame::BootGame()
|
||||||
@ -722,7 +722,7 @@ void CFrame::StatusBarMessage(char * Text, ...)
|
|||||||
|
|
||||||
|
|
||||||
// Miscellaneous menus
|
// Miscellaneous menus
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
// NetPlay stuff
|
// NetPlay stuff
|
||||||
void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
|
void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
|
||||||
{
|
{
|
||||||
@ -849,7 +849,7 @@ void CFrame::OnFrameSkip(wxCommandEvent& event)
|
|||||||
|
|
||||||
|
|
||||||
// GUI
|
// GUI
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
|
|
||||||
// Update the enabled/disabled status
|
// Update the enabled/disabled status
|
||||||
void CFrame::UpdateGUI()
|
void CFrame::UpdateGUI()
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッッッッッ
|
// -------------
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "Frame.h"
|
#include "Frame.h"
|
||||||
#include "FileUtil.h"
|
#include "FileUtil.h"
|
||||||
|
@ -117,7 +117,7 @@ enum
|
|||||||
|
|
||||||
// --------------------------------------------------------------
|
// --------------------------------------------------------------
|
||||||
// Debugger Menu Entries
|
// Debugger Menu Entries
|
||||||
// ッッッッッッッッッッッッッッッッッッッッ
|
// --------------------
|
||||||
// CPU Mode
|
// CPU Mode
|
||||||
IDM_INTERPRETER,
|
IDM_INTERPRETER,
|
||||||
//IDM_DUALCORE, // not used
|
//IDM_DUALCORE, // not used
|
||||||
@ -167,7 +167,7 @@ enum
|
|||||||
|
|
||||||
// --------------------------------------------------------------
|
// --------------------------------------------------------------
|
||||||
// Debugger Toolbar
|
// Debugger Toolbar
|
||||||
// ッッッッッッッッッッッッッッッッッッッッ
|
// --------------------
|
||||||
ID_TOOLBAR_DEBUG,
|
ID_TOOLBAR_DEBUG,
|
||||||
IDM_DEBUG_GO,
|
IDM_DEBUG_GO,
|
||||||
IDM_STEP,
|
IDM_STEP,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: Input Configuration and Calibration
|
// Name: Input Configuration and Calibration
|
||||||
// Description: Common SDL Input Functions
|
// Description: Common SDL Input Functions
|
||||||
//
|
//
|
||||||
@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
#if defined HAVE_WX && HAVE_WX
|
#if defined HAVE_WX && HAVE_WX
|
||||||
#include <wx/wx.h>
|
#include <wx/wx.h>
|
||||||
#endif
|
#endif
|
||||||
@ -52,7 +52,7 @@ namespace InputCommon
|
|||||||
|
|
||||||
|
|
||||||
// Degree to radian and back
|
// Degree to radian and back
|
||||||
// ッッッッッッッッッッッッッ
|
// -------------
|
||||||
float Deg2Rad(float Deg)
|
float Deg2Rad(float Deg)
|
||||||
{
|
{
|
||||||
return Deg * ((float)M_PI / 180.0f);
|
return Deg * ((float)M_PI / 180.0f);
|
||||||
@ -66,7 +66,7 @@ float Rad2Deg(float Rad)
|
|||||||
|
|
||||||
|
|
||||||
// Check if the pad is within the dead zone, we assume the range is 0x8000
|
// Check if the pad is within the dead zone, we assume the range is 0x8000
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
float CoordinatesToRadius(int x, int y)
|
float CoordinatesToRadius(int x, int y)
|
||||||
{
|
{
|
||||||
return sqrt(pow((float)x, 2) + pow((float)y, 2));
|
return sqrt(pow((float)x, 2) + pow((float)y, 2));
|
||||||
@ -90,13 +90,13 @@ bool IsDeadZone(float DeadZone, int x, int y)
|
|||||||
|
|
||||||
|
|
||||||
// Scale down stick values from 0x8000 to 0x80
|
// Scale down stick values from 0x8000 to 0x80
|
||||||
/* ッッッッッッッッッッッッッッッッ
|
/* ----------------
|
||||||
The value returned by SDL_JoystickGetAxis is a signed integer s16
|
The value returned by SDL_JoystickGetAxis is a signed integer s16
|
||||||
(-32768 to 32767). The value used for the gamecube controller is an unsigned
|
(-32768 to 32767). The value used for the gamecube controller is an unsigned
|
||||||
char u8 (0 to 255) with neutral at 0x80 (128), so that it's equivalent to a signed
|
char u8 (0 to 255) with neutral at 0x80 (128), so that it's equivalent to a signed
|
||||||
-128 to 127.
|
-128 to 127.
|
||||||
*/
|
*/
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
int Pad_Convert(int _val)
|
int Pad_Convert(int _val)
|
||||||
{
|
{
|
||||||
/* If the limits on PadState[].axis[] actually is a u16 then we don't need this
|
/* If the limits on PadState[].axis[] actually is a u16 then we don't need this
|
||||||
@ -119,7 +119,7 @@ int Pad_Convert(int _val)
|
|||||||
|
|
||||||
|
|
||||||
// Adjust the radius
|
// Adjust the radius
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
void RadiusAdjustment(int &_x, int &_y, int _pad, std::string SRadius)
|
void RadiusAdjustment(int &_x, int &_y, int _pad, std::string SRadius)
|
||||||
{
|
{
|
||||||
// Get the radius setting
|
// Get the radius setting
|
||||||
@ -157,7 +157,7 @@ void RadiusAdjustment(int &_x, int &_y, int _pad, std::string SRadius)
|
|||||||
XBox 360 Wireless: 85%
|
XBox 360 Wireless: 85%
|
||||||
GameCube Controller (Third Party) with EMS Trio Linker Plus II: 60%
|
GameCube Controller (Third Party) with EMS Trio Linker Plus II: 60%
|
||||||
*/
|
*/
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
|
|
||||||
/* Calculate the distance from the outer edges of the box to the outer edges of the circle inside the box
|
/* Calculate the distance from the outer edges of the box to the outer edges of the circle inside the box
|
||||||
at any angle from 0° to 360°. The returned value is 1 + Distance, for example at most sqrt(2) in the
|
at any angle from 0° to 360°. The returned value is 1 + Distance, for example at most sqrt(2) in the
|
||||||
@ -233,7 +233,7 @@ void Square2Circle(int &_x, int &_y, int _pad, std::string SDiagonal, bool Circl
|
|||||||
|
|
||||||
|
|
||||||
// Windows Virtual Key Codes Names
|
// Windows Virtual Key Codes Names
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
std::string VKToString(int keycode)
|
std::string VKToString(int keycode)
|
||||||
{
|
{
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
#include "DirectInputBase.h"
|
#include "DirectInputBase.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
#include <windows.h> // System
|
#include <windows.h> // System
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: SDL Input
|
// Name: SDL Input
|
||||||
// Description: Common SDL Input Functions
|
// Description: Common SDL Input Functions
|
||||||
//
|
//
|
||||||
@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
#define _SDL_MAIN_ // Avoid certain declarations in SDL.h
|
#define _SDL_MAIN_ // Avoid certain declarations in SDL.h
|
||||||
#include "SDL.h" // Local
|
#include "SDL.h" // Local
|
||||||
#include "XInput.h"
|
#include "XInput.h"
|
||||||
@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Definitions
|
// Definitions
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
int g_LastPad = 0;
|
int g_LastPad = 0;
|
||||||
|
|
||||||
|
|
||||||
@ -50,14 +50,14 @@ namespace InputCommon
|
|||||||
|
|
||||||
|
|
||||||
// Definitions
|
// Definitions
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Search attached devices. Populate joyinfo for all attached physical devices.
|
// Search attached devices. Populate joyinfo for all attached physical devices.
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッ
|
// -----------------------
|
||||||
bool SearchDevices(std::vector<CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_NumGoodPads)
|
bool SearchDevices(std::vector<CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_NumGoodPads)
|
||||||
{
|
{
|
||||||
/* SDL 1.3 use DirectInput instead of the old Microsoft Multimedia API, and with this we need
|
/* SDL 1.3 use DirectInput instead of the old Microsoft Multimedia API, and with this we need
|
||||||
@ -113,16 +113,16 @@ bool SearchDevices(std::vector<CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_
|
|||||||
|
|
||||||
|
|
||||||
// Supporting functions
|
// Supporting functions
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
|
|
||||||
// Read current joystick status
|
// Read current joystick status
|
||||||
/* ッッッッッッッッッッッッッッッッ
|
/* ----------------
|
||||||
The value PadMapping[].buttons[] is the number of the assigned joypad button,
|
The value PadMapping[].buttons[] is the number of the assigned joypad button,
|
||||||
PadState[].buttons[] is the status of the button, it becomes 0 (no pressed) or 1 (pressed) */
|
PadState[].buttons[] is the status of the button, it becomes 0 (no pressed) or 1 (pressed) */
|
||||||
|
|
||||||
|
|
||||||
// Read buttons status. Called from GetJoyState().
|
// Read buttons status. Called from GetJoyState().
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッ
|
// ----------------------
|
||||||
void ReadButton(CONTROLLER_STATE &_PadState, CONTROLLER_MAPPING _PadMapping, int button, int NumButtons)
|
void ReadButton(CONTROLLER_STATE &_PadState, CONTROLLER_MAPPING _PadMapping, int button, int NumButtons)
|
||||||
{
|
{
|
||||||
int ctl_button = _PadMapping.buttons[button];
|
int ctl_button = _PadMapping.buttons[button];
|
||||||
@ -133,7 +133,7 @@ void ReadButton(CONTROLLER_STATE &_PadState, CONTROLLER_MAPPING _PadMapping, int
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Request joystick state.
|
// Request joystick state.
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッ
|
// ----------------------
|
||||||
/* Called from: PAD_GetStatus()
|
/* Called from: PAD_GetStatus()
|
||||||
Input: The virtual device 0, 1, 2 or 3
|
Input: The virtual device 0, 1, 2 or 3
|
||||||
Function: Updates the PadState struct with the current pad status. The input value "controller" is
|
Function: Updates the PadState struct with the current pad status. The input value "controller" is
|
||||||
@ -242,10 +242,10 @@ void GetJoyState(CONTROLLER_STATE &_PadState, CONTROLLER_MAPPING _PadMapping, in
|
|||||||
|
|
||||||
|
|
||||||
// Configure button mapping
|
// Configure button mapping
|
||||||
// ッッッッッッッッッッ
|
// ----------
|
||||||
|
|
||||||
// Avoid extreme axis values
|
// Avoid extreme axis values
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
/* Function: We have to avoid very big values to becuse some triggers are -0x8000 in the
|
/* Function: We have to avoid very big values to becuse some triggers are -0x8000 in the
|
||||||
unpressed state (and then go from -0x8000 to 0x8000 as they are fully pressed) */
|
unpressed state (and then go from -0x8000 to 0x8000 as they are fully pressed) */
|
||||||
bool AvoidValues(int value, bool NoTriggerFilter)
|
bool AvoidValues(int value, bool NoTriggerFilter)
|
||||||
@ -260,7 +260,7 @@ bool AvoidValues(int value, bool NoTriggerFilter)
|
|||||||
|
|
||||||
|
|
||||||
// Detect a pressed button
|
// Detect a pressed button
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
void GetButton(SDL_Joystick *joy, int ControllerID, int buttons, int axes, int hats,
|
void GetButton(SDL_Joystick *joy, int ControllerID, int buttons, int axes, int hats,
|
||||||
int &KeyboardKey, int &value, int &type, int &pressed, bool &Succeed, bool &Stop,
|
int &KeyboardKey, int &value, int &type, int &pressed, bool &Succeed, bool &Stop,
|
||||||
bool LeftRight, bool Axis, bool XInput, bool Button, bool Hat, bool NoTriggerFilter)
|
bool LeftRight, bool Axis, bool XInput, bool Button, bool Hat, bool NoTriggerFilter)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: SDL Input
|
// Name: SDL Input
|
||||||
// Description: Common SDL Input Functions
|
// Description: Common SDL Input Functions
|
||||||
//
|
//
|
||||||
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
#include <iostream> // System
|
#include <iostream> // System
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
@ -53,14 +53,14 @@ namespace InputCommon
|
|||||||
|
|
||||||
|
|
||||||
// Settings
|
// Settings
|
||||||
// ッッッッッッッッッッ
|
// ----------
|
||||||
// Show a status window with the detected axes, buttons and so on
|
// Show a status window with the detected axes, buttons and so on
|
||||||
//#define SHOW_PAD_STATUS
|
//#define SHOW_PAD_STATUS
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Structures
|
// Structures
|
||||||
/* ッッッッッッッッッッッッッッッッッッッ
|
/* -------------------
|
||||||
CONTROLLER_STATE buttons (PadState) = 0 or 1
|
CONTROLLER_STATE buttons (PadState) = 0 or 1
|
||||||
CONTROLLER_MAPPING buttons (joystick) = 0 or 1, 2, 3, 4, a certain joypad button
|
CONTROLLER_MAPPING buttons (joystick) = 0 or 1, 2, 3, 4, a certain joypad button
|
||||||
|
|
||||||
@ -225,7 +225,7 @@ struct CONTROLLER_MAPPING_NEW // GC PAD MAPPING
|
|||||||
|
|
||||||
|
|
||||||
// Declarations
|
// Declarations
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
|
|
||||||
// General functions
|
// General functions
|
||||||
bool SearchDevices(std::vector<CONTROLLER_INFO> &_joyinfo, int &NumPads, int &NumGoodPads);
|
bool SearchDevices(std::vector<CONTROLLER_INFO> &_joyinfo, int &NumPads, int &NumGoodPads);
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// File description
|
// File description
|
||||||
/* ッッッッッッッッッッッッッッッッッッッ
|
/* -------------------
|
||||||
Function: This file will get the status of the analog triggers of any connected XInput device.
|
Function: This file will get the status of the analog triggers of any connected XInput device.
|
||||||
This code was made with the help of SimpleController.cpp in the June 2008 Microsoft DirectX SDK
|
This code was made with the help of SimpleController.cpp in the June 2008 Microsoft DirectX SDK
|
||||||
Samples.
|
Samples.
|
||||||
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Includes
|
// Includes
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <XInput.h> // XInput API
|
#include <XInput.h> // XInput API
|
||||||
|
|
||||||
@ -47,7 +47,7 @@ namespace XInput
|
|||||||
|
|
||||||
|
|
||||||
// Declarations
|
// Declarations
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
|
|
||||||
#define MAX_CONTROLLERS 4 // XInput handles up to 4 controllers
|
#define MAX_CONTROLLERS 4 // XInput handles up to 4 controllers
|
||||||
|
|
||||||
@ -62,7 +62,7 @@ CONTROLER_STATE g_Controllers[MAX_CONTROLLERS];
|
|||||||
|
|
||||||
|
|
||||||
// Init
|
// Init
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
/* Function: Calculate the number of connected XInput devices
|
/* Function: Calculate the number of connected XInput devices
|
||||||
Todo: Implement this to figure out if there are multiple XInput controllers connected,
|
Todo: Implement this to figure out if there are multiple XInput controllers connected,
|
||||||
we currently only try to connect to XInput device 0 */
|
we currently only try to connect to XInput device 0 */
|
||||||
@ -92,7 +92,7 @@ void Init()
|
|||||||
|
|
||||||
|
|
||||||
// Get the trigger status
|
// Get the trigger status
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
int GetXI(int Controller, int Button)
|
int GetXI(int Controller, int Button)
|
||||||
{
|
{
|
||||||
// Update the internal status
|
// Update the internal status
|
||||||
@ -118,7 +118,7 @@ int GetXI(int Controller, int Button)
|
|||||||
|
|
||||||
|
|
||||||
// Check if a certain controller is connected
|
// Check if a certain controller is connected
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
bool IsConnected(int Controller)
|
bool IsConnected(int Controller)
|
||||||
{
|
{
|
||||||
DWORD dwResult = XInputGetState( Controller, &g_Controllers[Controller].state );
|
DWORD dwResult = XInputGetState( Controller, &g_Controllers[Controller].state );
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Includes
|
// Includes
|
||||||
// ッッッッッッッッッッ
|
// ----------
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
|
||||||
@ -34,7 +34,7 @@ namespace XInput
|
|||||||
|
|
||||||
|
|
||||||
// Declarations
|
// Declarations
|
||||||
// ッッッッッッッッッッ
|
// ----------
|
||||||
void Init();
|
void Init();
|
||||||
int GetXI(int Controller, int Button);
|
int GetXI(int Controller, int Button);
|
||||||
bool IsConnected(int Controller);
|
bool IsConnected(int Controller);
|
||||||
|
@ -106,7 +106,7 @@ inline float Memory_Read_Float(u32 _uAddress)
|
|||||||
|
|
||||||
|
|
||||||
// Logging
|
// Logging
|
||||||
// ッッッッッッッッッッ
|
// ----------
|
||||||
void HandleGLError();
|
void HandleGLError();
|
||||||
|
|
||||||
|
|
||||||
|
@ -89,7 +89,7 @@ PADConfigDialogSimple::~PADConfigDialogSimple()
|
|||||||
|
|
||||||
|
|
||||||
// Create input button controls
|
// Create input button controls
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
inline void AddControl(wxPanel *pan, wxButton **button, wxStaticBoxSizer *sizer,
|
inline void AddControl(wxPanel *pan, wxButton **button, wxStaticBoxSizer *sizer,
|
||||||
const char *name, int ctl, int controller)
|
const char *name, int ctl, int controller)
|
||||||
{
|
{
|
||||||
@ -222,7 +222,7 @@ void PADConfigDialogSimple::CreateGUIControls()
|
|||||||
|
|
||||||
|
|
||||||
// Rerecording
|
// Rerecording
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
#ifdef RERECORDING
|
#ifdef RERECORDING
|
||||||
// Create controls
|
// Create controls
|
||||||
m_SizeRecording[i] = new wxStaticBoxSizer(wxVERTICAL, m_Controller[i], wxT("Input Recording"));
|
m_SizeRecording[i] = new wxStaticBoxSizer(wxVERTICAL, m_Controller[i], wxT("Input Recording"));
|
||||||
|
@ -90,9 +90,9 @@ int OSDChoice = 0, OSDTime = 0, OSDInternalW = 0, OSDInternalH = 0;
|
|||||||
|
|
||||||
// ---------------------------------------------------------------------
|
// ---------------------------------------------------------------------
|
||||||
// OSD Menu
|
// OSD Menu
|
||||||
// ッッッッッッッッッッッッッ
|
// -------------
|
||||||
// Let's begin with 3 since 1 and 2 are default Wii keys
|
// Let's begin with 3 since 1 and 2 are default Wii keys
|
||||||
// ッッッッッッッッッッッッッ
|
// -------------
|
||||||
void OSDMenu(WPARAM wParam)
|
void OSDMenu(WPARAM wParam)
|
||||||
{
|
{
|
||||||
switch( LOWORD( wParam ))
|
switch( LOWORD( wParam ))
|
||||||
@ -237,7 +237,7 @@ void FreeLookInput( UINT iMsg, WPARAM wParam )
|
|||||||
|
|
||||||
// ---------------------------------------------------------------------
|
// ---------------------------------------------------------------------
|
||||||
// KeyDown events
|
// KeyDown events
|
||||||
// ッッッッッッッッッッッッッ
|
// -------------
|
||||||
void OnKeyDown(WPARAM wParam)
|
void OnKeyDown(WPARAM wParam)
|
||||||
{
|
{
|
||||||
switch (LOWORD( wParam ))
|
switch (LOWORD( wParam ))
|
||||||
|
@ -76,7 +76,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Declarations and definitions
|
// Declarations and definitions
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッッッッッッ
|
// ----------------------------
|
||||||
CGcontext g_cgcontext;
|
CGcontext g_cgcontext;
|
||||||
CGprofile g_cgvProf;
|
CGprofile g_cgvProf;
|
||||||
CGprofile g_cgfProf;
|
CGprofile g_cgfProf;
|
||||||
@ -668,10 +668,10 @@ u32 Renderer::AccessEFB(EFBAccessType type, int x, int y)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Function: This function handles the OpenGL glScissor() function
|
// Function: This function handles the OpenGL glScissor() function
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッッッッッッ
|
// ----------------------------
|
||||||
// Call browser: OpcodeDecoding.cpp ExecuteDisplayList > Decode() > LoadBPReg()
|
// Call browser: OpcodeDecoding.cpp ExecuteDisplayList > Decode() > LoadBPReg()
|
||||||
// case 0x52 > SetScissorRect()
|
// case 0x52 > SetScissorRect()
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッッッッッッ
|
// ----------------------------
|
||||||
// bpmem.scissorTL.x, y = 342x342
|
// bpmem.scissorTL.x, y = 342x342
|
||||||
// bpmem.scissorBR.x, y = 981x821
|
// bpmem.scissorBR.x, y = 981x821
|
||||||
// Renderer::GetTargetHeight() = the fixed ini file setting
|
// Renderer::GetTargetHeight() = the fixed ini file setting
|
||||||
@ -1068,12 +1068,12 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
|
|||||||
|
|
||||||
|
|
||||||
// We can now draw whatever we want on top of the picture. Then we copy the final picture to the output.
|
// We can now draw whatever we want on top of the picture. Then we copy the final picture to the output.
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッッッッッッ
|
// ----------------------------
|
||||||
void Renderer::SwapBuffers()
|
void Renderer::SwapBuffers()
|
||||||
{
|
{
|
||||||
// ---------------------------------------------------------------------
|
// ---------------------------------------------------------------------
|
||||||
// Count FPS.
|
// Count FPS.
|
||||||
// ッッッッッッッッッッッッッ
|
// -------------
|
||||||
static int fpscount = 0;
|
static int fpscount = 0;
|
||||||
static unsigned long lasttime;
|
static unsigned long lasttime;
|
||||||
++fpscount;
|
++fpscount;
|
||||||
|
@ -978,7 +978,7 @@ void InterruptDebugging(bool Emu, const void* _pData)
|
|||||||
/* Returns a timestamp with three decimals for precise time comparisons. The return format is
|
/* Returns a timestamp with three decimals for precise time comparisons. The return format is
|
||||||
of the form seconds.milleseconds for example 1234.123. The leding seconds have no particular meaning
|
of the form seconds.milleseconds for example 1234.123. The leding seconds have no particular meaning
|
||||||
but are just there to enable use to tell if we have entered a new second or now. */
|
but are just there to enable use to tell if we have entered a new second or now. */
|
||||||
// ッッッッッッッッッッッッッッッッッ
|
// -----------------
|
||||||
|
|
||||||
/* Calculate the current update frequency. Calculate the time between ten updates, and average
|
/* Calculate the current update frequency. Calculate the time between ten updates, and average
|
||||||
five such rates. If we assume there are 60 updates per second if the game is running at full
|
five such rates. If we assume there are 60 updates per second if the game is running at full
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// -------------------
|
||||||
// Name: nJoy
|
// Name: nJoy
|
||||||
// Description: A Dolphin Compatible Input Plugin
|
// Description: A Dolphin Compatible Input Plugin
|
||||||
//
|
//
|
||||||
@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ¯¯¯¯¯¯¯¯¯
|
// ---------
|
||||||
#include "nJoy.h"
|
#include "nJoy.h"
|
||||||
#include "Common.h"
|
#include "Common.h"
|
||||||
|
|
||||||
@ -44,7 +44,7 @@ extern PADConfigDialognJoy* m_ConfigFrame;
|
|||||||
|
|
||||||
|
|
||||||
// Run when created
|
// Run when created
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// -----------------
|
||||||
Config::Config()
|
Config::Config()
|
||||||
{
|
{
|
||||||
// Clear the memory
|
// Clear the memory
|
||||||
@ -53,7 +53,7 @@ Config::Config()
|
|||||||
|
|
||||||
|
|
||||||
// Enable output log
|
// Enable output log
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// -----------------
|
||||||
void DEBUG_INIT()
|
void DEBUG_INIT()
|
||||||
{
|
{
|
||||||
if (pFile)
|
if (pFile)
|
||||||
@ -71,11 +71,11 @@ void DEBUG_INIT()
|
|||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
fprintf(pFile, "Date: %s\nTime: %s\n", dateStr, timeStr);
|
fprintf(pFile, "Date: %s\nTime: %s\n", dateStr, timeStr);
|
||||||
#endif
|
#endif
|
||||||
fprintf(pFile, "¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯\n");
|
fprintf(pFile, "---------------\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disable output log
|
// Disable output log
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// ------------------
|
||||||
void DEBUG_QUIT()
|
void DEBUG_QUIT()
|
||||||
{
|
{
|
||||||
if (!pFile)
|
if (!pFile)
|
||||||
@ -94,7 +94,7 @@ void DEBUG_QUIT()
|
|||||||
|
|
||||||
|
|
||||||
// Save settings to file
|
// Save settings to file
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// ---------------------
|
||||||
void Config::Save(int Slot)
|
void Config::Save(int Slot)
|
||||||
{
|
{
|
||||||
// If there are no good pads don't save
|
// If there are no good pads don't save
|
||||||
@ -106,7 +106,7 @@ void Config::Save(int Slot)
|
|||||||
|
|
||||||
// ==================================================================
|
// ==================================================================
|
||||||
// Global settings
|
// Global settings
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// -----------------
|
||||||
file.Set("General", "ShowAdvanced", g_Config.bShowAdvanced);
|
file.Set("General", "ShowAdvanced", g_Config.bShowAdvanced);
|
||||||
file.Set("General", "SaveByID", g_Config.bSaveByID);
|
file.Set("General", "SaveByID", g_Config.bSaveByID);
|
||||||
file.Set("General", "CheckForFocus", g_Config.bCheckFocus);
|
file.Set("General", "CheckForFocus", g_Config.bCheckFocus);
|
||||||
@ -125,7 +125,7 @@ void Config::Save(int Slot)
|
|||||||
|
|
||||||
// ==================================================================
|
// ==================================================================
|
||||||
// Slot specific settings only
|
// Slot specific settings only
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// -----------------
|
||||||
std::string SectionName = StringFromFormat("PAD%i", i+1);
|
std::string SectionName = StringFromFormat("PAD%i", i+1);
|
||||||
|
|
||||||
// Save the physical device ID
|
// Save the physical device ID
|
||||||
@ -134,7 +134,7 @@ void Config::Save(int Slot)
|
|||||||
|
|
||||||
// ==================================================================
|
// ==================================================================
|
||||||
// Joypad or slot specific settings
|
// Joypad or slot specific settings
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// -----------------
|
||||||
// Current joypad device ID: PadMapping[i].ID
|
// Current joypad device ID: PadMapping[i].ID
|
||||||
// Current joypad name: joyinfo[PadMapping[i].ID].Name
|
// Current joypad name: joyinfo[PadMapping[i].ID].Name
|
||||||
if(g_Config.bSaveByID)
|
if(g_Config.bSaveByID)
|
||||||
@ -193,7 +193,7 @@ void Config::Save(int Slot)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Load settings from file
|
// Load settings from file
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// -----------------------
|
||||||
void Config::Load(bool ChangePad, bool ChangeSaveByID)
|
void Config::Load(bool ChangePad, bool ChangeSaveByID)
|
||||||
{
|
{
|
||||||
// If there are no good pads don't load
|
// If there are no good pads don't load
|
||||||
@ -206,7 +206,7 @@ void Config::Load(bool ChangePad, bool ChangeSaveByID)
|
|||||||
|
|
||||||
// ==================================================================
|
// ==================================================================
|
||||||
// Global settings
|
// Global settings
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// -----------------
|
||||||
file.Get("General", "ShowAdvanced", &g_Config.bShowAdvanced, false);
|
file.Get("General", "ShowAdvanced", &g_Config.bShowAdvanced, false);
|
||||||
file.Get("General", "CheckForFocus", &g_Config.bCheckFocus, false);
|
file.Get("General", "CheckForFocus", &g_Config.bCheckFocus, false);
|
||||||
file.Get("General", "NoTriggerFilter", &g_Config.bNoTriggerFilter, false);
|
file.Get("General", "NoTriggerFilter", &g_Config.bNoTriggerFilter, false);
|
||||||
@ -234,7 +234,7 @@ void Config::Load(bool ChangePad, bool ChangeSaveByID)
|
|||||||
|
|
||||||
// ==================================================================
|
// ==================================================================
|
||||||
// Joypad or slot specific settings
|
// Joypad or slot specific settings
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// -----------------
|
||||||
// Current joypad device ID: PadMapping[i].ID
|
// Current joypad device ID: PadMapping[i].ID
|
||||||
// Current joypad name: joyinfo[PadMapping[i].ID].Name
|
// Current joypad name: joyinfo[PadMapping[i].ID].Name
|
||||||
if(g_Config.bSaveByID)
|
if(g_Config.bSaveByID)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: nJoy
|
// Name: nJoy
|
||||||
// Description: A Dolphin Compatible Input Plugin
|
// Description: A Dolphin Compatible Input Plugin
|
||||||
//
|
//
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: nJoy
|
// Name: nJoy
|
||||||
// Description: A Dolphin Compatible Input Plugin
|
// Description: A Dolphin Compatible Input Plugin
|
||||||
//
|
//
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: nJoy
|
// Name: nJoy
|
||||||
// Description: A Dolphin Compatible Input Plugin
|
// Description: A Dolphin Compatible Input Plugin
|
||||||
//
|
//
|
||||||
@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
#include "ConfigBox.h"
|
#include "ConfigBox.h"
|
||||||
#include "../nJoy.h"
|
#include "../nJoy.h"
|
||||||
#include "Images/controller.xpm"
|
#include "Images/controller.xpm"
|
||||||
@ -45,7 +45,7 @@ extern bool g_EmulatorRunning;
|
|||||||
bool StrangeHack = true;
|
bool StrangeHack = true;
|
||||||
|
|
||||||
// Set PAD status
|
// Set PAD status
|
||||||
// ッッッッッッッッッッッッッッ
|
// --------------
|
||||||
void PADConfigDialognJoy::PadGetStatus()
|
void PADConfigDialognJoy::PadGetStatus()
|
||||||
{
|
{
|
||||||
/* Return if it's not detected. The ID should never be less than zero here, it can only be that
|
/* Return if it's not detected. The ID should never be less than zero here, it can only be that
|
||||||
@ -64,7 +64,7 @@ void PADConfigDialognJoy::PadGetStatus()
|
|||||||
|
|
||||||
|
|
||||||
// Analog stick
|
// Analog stick
|
||||||
// ッッッッッッッッッッッッッッッッッ
|
// -----------------
|
||||||
// Set Deadzones perhaps out of function
|
// Set Deadzones perhaps out of function
|
||||||
//int deadzone = (int)(((float)(128.00/100.00)) * (float)(PadMapping[_numPAD].deadzone+1));
|
//int deadzone = (int)(((float)(128.00/100.00)) * (float)(PadMapping[_numPAD].deadzone+1));
|
||||||
//int deadzone2 = (int)(((float)(-128.00/100.00)) * (float)(PadMapping[_numPAD].deadzone+1));
|
//int deadzone2 = (int)(((float)(-128.00/100.00)) * (float)(PadMapping[_numPAD].deadzone+1));
|
||||||
@ -123,7 +123,7 @@ void PADConfigDialognJoy::PadGetStatus()
|
|||||||
|
|
||||||
|
|
||||||
// Triggers
|
// Triggers
|
||||||
// ッッッッッッッッッッッッッッッッッ
|
// -----------------
|
||||||
int TriggerValue = 255;
|
int TriggerValue = 255;
|
||||||
if (PadState[notebookpage].halfpress) TriggerValue = 100;
|
if (PadState[notebookpage].halfpress) TriggerValue = 100;
|
||||||
|
|
||||||
@ -159,7 +159,7 @@ void PADConfigDialognJoy::PadGetStatus()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Show the current pad status
|
// Show the current pad status
|
||||||
// ッッッッッッッッッッッッッッッッッ
|
// -----------------
|
||||||
std::string ShowStatus(int VirtualController)
|
std::string ShowStatus(int VirtualController)
|
||||||
{
|
{
|
||||||
// Save the physical device
|
// Save the physical device
|
||||||
@ -237,7 +237,7 @@ std::string ShowStatus(int VirtualController)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Populate the advanced tab
|
// Populate the advanced tab
|
||||||
// ッッッッッッッッッッッッッッッッッ
|
// -----------------
|
||||||
void PADConfigDialognJoy::Update()
|
void PADConfigDialognJoy::Update()
|
||||||
{
|
{
|
||||||
// Check that Dolphin is in focus, otherwise don't update the pad status
|
// Check that Dolphin is in focus, otherwise don't update the pad status
|
||||||
@ -265,7 +265,7 @@ void PADConfigDialognJoy::Update()
|
|||||||
|
|
||||||
|
|
||||||
// Populate the advanced tab
|
// Populate the advanced tab
|
||||||
// ッッッッッッッッッッッッッッッッッ
|
// -----------------
|
||||||
void PADConfigDialognJoy::CreateAdvancedControls(int i)
|
void PADConfigDialognJoy::CreateAdvancedControls(int i)
|
||||||
{
|
{
|
||||||
// Main-stick
|
// Main-stick
|
||||||
@ -320,7 +320,7 @@ void PADConfigDialognJoy::CreateAdvancedControls(int i)
|
|||||||
|
|
||||||
|
|
||||||
// Rerecording
|
// Rerecording
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
#ifdef RERECORDING
|
#ifdef RERECORDING
|
||||||
// Create controls
|
// Create controls
|
||||||
m_SizeRecording[i] = new wxStaticBoxSizer(wxVERTICAL, m_Controller[i], wxT("Input Recording"));
|
m_SizeRecording[i] = new wxStaticBoxSizer(wxVERTICAL, m_Controller[i], wxT("Input Recording"));
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: nJoy
|
// Name: nJoy
|
||||||
// Description: A Dolphin Compatible Input Plugin
|
// Description: A Dolphin Compatible Input Plugin
|
||||||
//
|
//
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: nJoy
|
// Name: nJoy
|
||||||
// Description: A Dolphin Compatible Input Plugin
|
// Description: A Dolphin Compatible Input Plugin
|
||||||
//
|
//
|
||||||
@ -96,7 +96,7 @@ class PADConfigDialognJoy : public wxDialog
|
|||||||
|
|
||||||
|
|
||||||
// Settings
|
// Settings
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
|
|
||||||
wxComboBox *m_Joyname[4];
|
wxComboBox *m_Joyname[4];
|
||||||
wxComboBox *m_ControlType[4], *m_TriggerType[4];
|
wxComboBox *m_ControlType[4], *m_TriggerType[4];
|
||||||
@ -133,7 +133,7 @@ class PADConfigDialognJoy : public wxDialog
|
|||||||
|
|
||||||
|
|
||||||
// Keys
|
// Keys
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
int g_Pressed; // Keyboard input
|
int g_Pressed; // Keyboard input
|
||||||
|
|
||||||
wxTextCtrl *m_JoyShoulderL[4];
|
wxTextCtrl *m_JoyShoulderL[4];
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: nJoy
|
// Name: nJoy
|
||||||
// Description: A Dolphin Compatible Input Plugin
|
// Description: A Dolphin Compatible Input Plugin
|
||||||
//
|
//
|
||||||
@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
#include "math.h" // System
|
#include "math.h" // System
|
||||||
|
|
||||||
#include "ConfigBox.h" // Local
|
#include "ConfigBox.h" // Local
|
||||||
@ -44,7 +44,7 @@ extern bool g_EmulatorRunning;
|
|||||||
|
|
||||||
|
|
||||||
// Set dialog items from saved values
|
// Set dialog items from saved values
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
void PADConfigDialognJoy::UpdateGUIButtonMapping(int controller)
|
void PADConfigDialognJoy::UpdateGUIButtonMapping(int controller)
|
||||||
{
|
{
|
||||||
// http://wiki.wxwidgets.org/Converting_everything_to_and_from_wxString
|
// http://wiki.wxwidgets.org/Converting_everything_to_and_from_wxString
|
||||||
@ -177,7 +177,7 @@ void PADConfigDialognJoy::SaveButtonMapping(int controller, bool DontChangeId, i
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Update the textbox for the buttons
|
// Update the textbox for the buttons
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
void PADConfigDialognJoy::SetButtonText(int id, const char *text, int Page)
|
void PADConfigDialognJoy::SetButtonText(int id, const char *text, int Page)
|
||||||
{
|
{
|
||||||
// Set controller value
|
// Set controller value
|
||||||
@ -212,7 +212,7 @@ void PADConfigDialognJoy::SetButtonText(int id, const char *text, int Page)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get the text in the textbox for the buttons
|
// Get the text in the textbox for the buttons
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
wxString PADConfigDialognJoy::GetButtonText(int id, int Page)
|
wxString PADConfigDialognJoy::GetButtonText(int id, int Page)
|
||||||
{
|
{
|
||||||
// Set controller value
|
// Set controller value
|
||||||
@ -253,11 +253,11 @@ wxString PADConfigDialognJoy::GetButtonText(int id, int Page)
|
|||||||
|
|
||||||
|
|
||||||
// Configure button mapping
|
// Configure button mapping
|
||||||
// ッッッッッッッッッッ
|
// ----------
|
||||||
|
|
||||||
|
|
||||||
// Wait for button press
|
// Wait for button press
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッ
|
// ---------------------
|
||||||
/* Loop or timer: There are basically two ways to do this. With a while() or for() loop, or with a
|
/* Loop or timer: There are basically two ways to do this. With a while() or for() loop, or with a
|
||||||
timer. The downside with the while() or for() loop is that there is no way to stop it if the user
|
timer. The downside with the while() or for() loop is that there is no way to stop it if the user
|
||||||
should select to configure another button while we are still in an old loop. What will happen then
|
should select to configure another button while we are still in an old loop. What will happen then
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: nJoy
|
// Name: nJoy
|
||||||
// Description: A Dolphin Compatible Input Plugin
|
// Description: A Dolphin Compatible Input Plugin
|
||||||
//
|
//
|
||||||
@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// File description
|
// File description
|
||||||
/* ッッッッッッッッッ
|
/* ---------
|
||||||
|
|
||||||
Rerecording options
|
Rerecording options
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ Rerecording options
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
#include "nJoy.h"
|
#include "nJoy.h"
|
||||||
#include "FileUtil.h"
|
#include "FileUtil.h"
|
||||||
#include "ChunkFile.h"
|
#include "ChunkFile.h"
|
||||||
@ -57,7 +57,7 @@ namespace Recording
|
|||||||
|
|
||||||
|
|
||||||
// Definitions
|
// Definitions
|
||||||
// ッッッッッッッッッッッッッ
|
// -------------
|
||||||
// Pre defined maxium storage limit
|
// Pre defined maxium storage limit
|
||||||
#define RECORD_SIZE (1024 * 128)
|
#define RECORD_SIZE (1024 * 128)
|
||||||
SPADStatus RecordBuffer[RECORD_SIZE];
|
SPADStatus RecordBuffer[RECORD_SIZE];
|
||||||
@ -68,7 +68,7 @@ int count = 0;
|
|||||||
|
|
||||||
|
|
||||||
// Recording functions
|
// Recording functions
|
||||||
// ッッッッッッッッッッッッッ
|
// -------------
|
||||||
void RecordInput(const SPADStatus& _rPADStatus)
|
void RecordInput(const SPADStatus& _rPADStatus)
|
||||||
{
|
{
|
||||||
if (count >= RECORD_SIZE) return;
|
if (count >= RECORD_SIZE) return;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: nJoy
|
// Name: nJoy
|
||||||
// Description: A Dolphin Compatible Input Plugin
|
// Description: A Dolphin Compatible Input Plugin
|
||||||
//
|
//
|
||||||
@ -32,13 +32,13 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
#include "nJoy.h"
|
#include "nJoy.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Enable or disable rumble.
|
// Enable or disable rumble.
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
|
|
||||||
// Rumble in windows
|
// Rumble in windows
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
@ -74,7 +74,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Use PAD rumble
|
// Use PAD rumble
|
||||||
// ッッッッッッッッッッッッッッ
|
// --------------
|
||||||
|
|
||||||
void Pad_Use_Rumble(u8 _numPAD)
|
void Pad_Use_Rumble(u8 _numPAD)
|
||||||
{
|
{
|
||||||
@ -130,7 +130,7 @@ void Pad_Use_Rumble(u8 _numPAD)
|
|||||||
|
|
||||||
|
|
||||||
// Set PAD rumble. Explanation: Stop = 0, Rumble = 1
|
// Set PAD rumble. Explanation: Stop = 0, Rumble = 1
|
||||||
// ッッッッッッッッッッッッッッ
|
// --------------
|
||||||
|
|
||||||
void PAD_Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength)
|
void PAD_Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength)
|
||||||
{
|
{
|
||||||
@ -189,7 +189,7 @@ void PAD_Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength)
|
|||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
// Rumble stuff :D!
|
// Rumble stuff :D!
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
//
|
//
|
||||||
|
|
||||||
HRESULT InitRumble(HWND hWnd)
|
HRESULT InitRumble(HWND hWnd)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: nJoy
|
// Name: nJoy
|
||||||
// Description: A Dolphin Compatible Input Plugin
|
// Description: A Dolphin Compatible Input Plugin
|
||||||
//
|
//
|
||||||
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Issues
|
// Issues
|
||||||
/* ッッッッッッッッッ
|
/* ---------
|
||||||
|
|
||||||
The StrangeHack in ConfigAdvanced.cpp doesn't work in Linux, it still wont resize the
|
The StrangeHack in ConfigAdvanced.cpp doesn't work in Linux, it still wont resize the
|
||||||
window correctly. So currently in Linux you have to have advanced controls enabled when
|
window correctly. So currently in Linux you have to have advanced controls enabled when
|
||||||
@ -46,7 +46,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Variables guide
|
// Variables guide
|
||||||
/* ッッッッッッッッッ
|
/* ---------
|
||||||
|
|
||||||
Joyinfo[1, 2, 3, 4, ..., number of attached devices]: Gamepad info that is populate by Search_Devices()
|
Joyinfo[1, 2, 3, 4, ..., number of attached devices]: Gamepad info that is populate by Search_Devices()
|
||||||
PadMapping[1, 2, 3 and 4]: The button mapping
|
PadMapping[1, 2, 3 and 4]: The button mapping
|
||||||
@ -67,7 +67,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Include
|
// Include
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
#include "nJoy.h"
|
#include "nJoy.h"
|
||||||
#include "LogManager.h"
|
#include "LogManager.h"
|
||||||
|
|
||||||
@ -80,7 +80,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Variables
|
// Variables
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
|
|
||||||
#define _EXCLUDE_MAIN_ // Avoid certain declarations in nJoy.h
|
#define _EXCLUDE_MAIN_ // Avoid certain declarations in nJoy.h
|
||||||
FILE *pFile;
|
FILE *pFile;
|
||||||
@ -167,10 +167,10 @@ wxWindow* GetParentedWxWindow(HWND Parent)
|
|||||||
|
|
||||||
|
|
||||||
// Input Plugin Functions (from spec's)
|
// Input Plugin Functions (from spec's)
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッッ
|
// ------------------------------------
|
||||||
|
|
||||||
// Get properties of plugin
|
// Get properties of plugin
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッッ
|
// ------------------------
|
||||||
void GetDllInfo(PLUGIN_INFO* _PluginInfo)
|
void GetDllInfo(PLUGIN_INFO* _PluginInfo)
|
||||||
{
|
{
|
||||||
_PluginInfo->Version = 0x0100;
|
_PluginInfo->Version = 0x0100;
|
||||||
@ -195,7 +195,7 @@ void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals)
|
|||||||
|
|
||||||
|
|
||||||
// Call config dialog
|
// Call config dialog
|
||||||
// ッッッッッッッッッッッッッッッッッッ
|
// ------------------
|
||||||
void DllConfig(HWND _hParent)
|
void DllConfig(HWND _hParent)
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
@ -239,7 +239,7 @@ void DllDebugger(HWND _hParent, bool Show) {}
|
|||||||
|
|
||||||
|
|
||||||
// Init PAD (start emulation)
|
// Init PAD (start emulation)
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッッッッ
|
// --------------------------
|
||||||
/* Information: This function can not be run twice without a Shutdown in between. If
|
/* Information: This function can not be run twice without a Shutdown in between. If
|
||||||
it's run twice the SDL_Init() will cause a crash. One solution to this is to keep a
|
it's run twice the SDL_Init() will cause a crash. One solution to this is to keep a
|
||||||
global function that remembers the SDL_Init() and SDL_Quit() (g_EmulatorRunning does
|
global function that remembers the SDL_Init() and SDL_Quit() (g_EmulatorRunning does
|
||||||
@ -279,7 +279,7 @@ void Initialize(void *init)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Shutdown PAD (stop emulation)
|
// Shutdown PAD (stop emulation)
|
||||||
// ッッッッッッッッッッッッッッッッッッッッッッッッッッッッッ
|
// -----------------------------
|
||||||
/* Information: This function can not be run twice without an Initialize in between. If
|
/* Information: This function can not be run twice without an Initialize in between. If
|
||||||
it's run twice the SDL_...() functions below will cause a crash.
|
it's run twice the SDL_...() functions below will cause a crash.
|
||||||
Called from: The Dolphin Core, PADConfigDialognJoy::OnClose() */
|
Called from: The Dolphin Core, PADConfigDialognJoy::OnClose() */
|
||||||
@ -343,7 +343,7 @@ void Shutdown()
|
|||||||
|
|
||||||
|
|
||||||
// Set buttons status from keyboard input. Currently this is done from wxWidgets in the main application.
|
// Set buttons status from keyboard input. Currently this is done from wxWidgets in the main application.
|
||||||
// ッッッッッッッッッッッッッッ
|
// --------------
|
||||||
void PAD_Input(u16 _Key, u8 _UpDown)
|
void PAD_Input(u16 _Key, u8 _UpDown)
|
||||||
{
|
{
|
||||||
// Check that Dolphin is in focus, otherwise don't update the pad status
|
// Check that Dolphin is in focus, otherwise don't update the pad status
|
||||||
@ -371,7 +371,7 @@ void PAD_Input(u16 _Key, u8 _UpDown)
|
|||||||
|
|
||||||
|
|
||||||
// Save state
|
// Save state
|
||||||
// ッッッッッッッッッッッッッッ
|
// --------------
|
||||||
void DoState(unsigned char **ptr, int mode)
|
void DoState(unsigned char **ptr, int mode)
|
||||||
{
|
{
|
||||||
#ifdef RERECORDING
|
#ifdef RERECORDING
|
||||||
@ -381,7 +381,7 @@ void DoState(unsigned char **ptr, int mode)
|
|||||||
|
|
||||||
|
|
||||||
// Set PAD status
|
// Set PAD status
|
||||||
// ッッッッッッッッッッッッッッ
|
// --------------
|
||||||
// Called from: SI_DeviceGCController.cpp
|
// Called from: SI_DeviceGCController.cpp
|
||||||
// Function: Gives the current pad status to the Core
|
// Function: Gives the current pad status to the Core
|
||||||
void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
|
void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
|
||||||
@ -595,7 +595,7 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
|
|||||||
|
|
||||||
|
|
||||||
// Search for SDL devices
|
// Search for SDL devices
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
bool Search_Devices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_NumGoodPads)
|
bool Search_Devices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_NumGoodPads)
|
||||||
{
|
{
|
||||||
bool Success = InputCommon::SearchDevices(_joyinfo, _NumPads, _NumGoodPads);
|
bool Success = InputCommon::SearchDevices(_joyinfo, _NumPads, _NumGoodPads);
|
||||||
@ -625,7 +625,7 @@ bool Search_Devices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_N
|
|||||||
|
|
||||||
/* Check if any of the pads failed to open. In Windows there is a strange "IDirectInputDevice2::
|
/* Check if any of the pads failed to open. In Windows there is a strange "IDirectInputDevice2::
|
||||||
SetDataFormat() DirectX error -2147024809" after exactly four SDL_Init() and SDL_Quit() */
|
SetDataFormat() DirectX error -2147024809" after exactly four SDL_Init() and SDL_Quit() */
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
bool ReloadDLL()
|
bool ReloadDLL()
|
||||||
{
|
{
|
||||||
if ( (PadState[0].joy == NULL)
|
if ( (PadState[0].joy == NULL)
|
||||||
@ -654,7 +654,7 @@ bool ReloadDLL()
|
|||||||
|
|
||||||
|
|
||||||
// Check if Dolphin is in focus
|
// Check if Dolphin is in focus
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
bool IsFocus()
|
bool IsFocus()
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
// Project description
|
// Project description
|
||||||
// ッッッッッッッッッッッッッッッッッッッ
|
// -------------------
|
||||||
// Name: nJoy
|
// Name: nJoy
|
||||||
// Description: A Dolphin Compatible Input Plugin
|
// Description: A Dolphin Compatible Input Plugin
|
||||||
//
|
//
|
||||||
@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Includes
|
// Includes
|
||||||
// ッッッッッッッッッッ
|
// ----------
|
||||||
#include <vector> // System
|
#include <vector> // System
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
@ -80,7 +80,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Define
|
// Define
|
||||||
// ッッッッッッッッッッ
|
// ----------
|
||||||
|
|
||||||
#define INPUT_VERSION "0.3"
|
#define INPUT_VERSION "0.3"
|
||||||
#define INPUT_STATE wxT("PUBLIC RELEASE")
|
#define INPUT_STATE wxT("PUBLIC RELEASE")
|
||||||
@ -92,7 +92,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// Input vector. Todo: Save the configured keys here instead of in joystick
|
// Input vector. Todo: Save the configured keys here instead of in joystick
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
/*
|
/*
|
||||||
#ifndef _CONTROLLER_STATE_H
|
#ifndef _CONTROLLER_STATE_H
|
||||||
extern std::vector<u8> Keys;
|
extern std::vector<u8> Keys;
|
||||||
@ -103,7 +103,7 @@ extern std::vector<u8> Keys;
|
|||||||
|
|
||||||
|
|
||||||
// Variables
|
// Variables
|
||||||
// ッッッッッッッッッ
|
// ---------
|
||||||
#ifndef _EXCLUDE_MAIN_
|
#ifndef _EXCLUDE_MAIN_
|
||||||
extern SPADInitialize *g_PADInitialize;
|
extern SPADInitialize *g_PADInitialize;
|
||||||
extern FILE *pFile;
|
extern FILE *pFile;
|
||||||
@ -120,7 +120,7 @@ extern std::vector<u8> Keys;
|
|||||||
|
|
||||||
|
|
||||||
// Custom Functions
|
// Custom Functions
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
bool Search_Devices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_NumGoodPads);
|
bool Search_Devices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_NumGoodPads);
|
||||||
void DEBUG_INIT();
|
void DEBUG_INIT();
|
||||||
void DEBUG_QUIT();
|
void DEBUG_QUIT();
|
||||||
@ -135,7 +135,7 @@ HRESULT InitRumble(HWND hWnd);
|
|||||||
|
|
||||||
|
|
||||||
// ReRecording
|
// ReRecording
|
||||||
// ッッッッッッッッッッッッッッッッ
|
// ----------------
|
||||||
#ifdef RERECORDING
|
#ifdef RERECORDING
|
||||||
namespace Recording
|
namespace Recording
|
||||||
{
|
{
|
||||||
|
@ -78,7 +78,7 @@ Where can I download the latest releases???
|
|||||||
Can I mirror this file???
|
Can I mirror this file???
|
||||||
Sure, just don't forget to add a link to:
|
Sure, just don't forget to add a link to:
|
||||||
www.multigesture.net OR www.dolphin-emu.com
|
www.multigesture.net OR www.dolphin-emu.com
|
||||||
ッッッッッッッッッッッッッッッッッッッッ ッッッッッッッッッッッッッッッッッッッ
|
-------------------- -------------------
|
||||||
Why should I use nJoy instead of the default input plugin???
|
Why should I use nJoy instead of the default input plugin???
|
||||||
At this moment the default plugin only supports keyboard input.
|
At this moment the default plugin only supports keyboard input.
|
||||||
nJoy supports Joysticks. And besides that, if you have an GC-adapter
|
nJoy supports Joysticks. And besides that, if you have an GC-adapter
|
||||||
|
Loading…
x
Reference in New Issue
Block a user