AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/urde

This commit is contained in:
Jack Andersen 2018-02-04 20:57:18 -10:00
parent ac8dfde174 97835607d9
commit 59af54afad
23 changed files with 63 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
NESEmulator/CNESEmulator.cpp
View File

@ -37,17 +37,18 @@ extern "C"
* of the MIT license. See the LICENSE file for details.
*/
#define WINDOWS_BUILD 1
#define DEBUG_HZ 0
#define DEBUG_MAIN_CALLS 0
#define DEBUG_KEY 0
#define DEBUG_LOAD_INFO 1
#ifndef _WIN32
std::chrono::steady_clock::time_point s_tp = std::chrono::steady_clock::now();
static std::chrono::milliseconds::rep GetTickCount()
{
return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - s_tp).count();
}
#endif
static const char *VERSION_STRING = "fixNES Alpha v1.0.5";
static char window_title[256];
@ -87,10 +88,6 @@ static bool inResize = false;
static bool inDiskSwitch = false;
static bool inReset = false;
#if WINDOWS_BUILD
//#include <windows.h>
//typedef bool (APIENTRY *PFNWGLSWAPINTERVALEXTPROC) (int interval);
//PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = NULL;
#if DEBUG_HZ
static int emuFrameStart = 0;
static int emuTimesCalled = 0;
@ -102,7 +99,6 @@ static int emuMainTimesCalled = 0;
static int emuMainTimesSkipped = 0;
static int emuMainTotalElapsed = 0;
#endif
#endif
#define DOTS 341
@ -242,14 +238,12 @@ void CNESEmulator::InitializeEmulator()
sprintf(window_title, "%s NES - %s\n", nesPAL ? "PAL" : "NTSC", VERSION_STRING);
sprintf(window_title_pause, "%s (Pause)", window_title);
#if WINDOWS_BUILD
#if DEBUG_HZ
emuFrameStart = GetTickCount();
#endif
#if DEBUG_MAIN_CALLS
emuMainFrameStart = GetTickCount();
#endif
#endif
emuFrameStart = GetTickCount();
#endif
#if DEBUG_MAIN_CALLS
emuMainFrameStart = GetTickCount();
#endif
cpuCycleTimer = nesPAL ? 16 : 12;
//do full frame per update loop
ppuCycleTimer = nesPAL ? 5 : 4;
@ -405,7 +399,7 @@ void CNESEmulator::NesEmuMainLoop(bool forceDraw)
{
if(emuRenderFrame || nesPause)
{
#if (WINDOWS_BUILD && DEBUG_MAIN_CALLS)
#if DEBUG_MAIN_CALLS
emuMainTimesSkipped++;
#endif
//printf("LC RENDER: %d\n", loopCount);
@ -431,7 +425,7 @@ void CNESEmulator::NesEmuMainLoop(bool forceDraw)
{
if(!apuCycleURDE() && !forceDraw)
{
#if (WINDOWS_BUILD && DEBUG_MAIN_CALLS)
#if DEBUG_MAIN_CALLS
emuMainTimesSkipped++;
#endif
#if CATCHUP_SKIP
@ -475,17 +469,17 @@ void CNESEmulator::NesEmuMainLoop(bool forceDraw)
emuRenderFrame = true;
if(fm2playRunning())
fm2playUpdate();
#if (WINDOWS_BUILD && DEBUG_HZ)
#if DEBUG_HZ
emuTimesCalled++;
int end = GetTickCount();
emuTotalElapsed += end - emuFrameStart;
if(emuTotalElapsed >= 1000)
{
printf("\r%iHz ", emuTimesCalled);
emuTimesCalled = 0;
emuTotalElapsed = 0;
}
emuFrameStart = end;
int end = GetTickCount();
emuTotalElapsed += end - emuFrameStart;
if(emuTotalElapsed >= 1000)
{
printf("\r%iHz ", emuTimesCalled);
emuTimesCalled = 0;
emuTotalElapsed = 0;
}
emuFrameStart = end;
#endif
if(ppuDebugPauseFrame)
{
@ -530,20 +524,20 @@ void CNESEmulator::NesEmuMainLoop(bool forceDraw)
printf("%dms %d %d\n", end - start, loopCount, m_procBufs);
#endif
#if (WINDOWS_BUILD && DEBUG_MAIN_CALLS)
#if DEBUG_MAIN_CALLS
emuMainTimesCalled++;
int end = GetTickCount();
int end = GetTickCount();
//printf("%dms\n", end - start);
emuMainTotalElapsed += end - emuMainFrameStart;
if(emuMainTotalElapsed >= 1000)
{
printf("\r%i calls, %i skips ", emuMainTimesCalled, emuMainTimesSkipped);
emuMainTotalElapsed += end - emuMainFrameStart;
if(emuMainTotalElapsed >= 1000)
{
printf("\r%i calls, %i skips ", emuMainTimesCalled, emuMainTimesSkipped);
fflush(stdout);
emuMainTimesCalled = 0;
emuMainTimesSkipped = 0;
emuMainTotalElapsed = 0;
}
emuMainFrameStart = end;
emuMainTimesCalled = 0;
emuMainTimesSkipped = 0;
emuMainTotalElapsed = 0;
}
emuMainFrameStart = end;
#endif
}

2
NESEmulator/CNESEmulator.hpp
View File

@ -9,7 +9,7 @@
namespace urde
{
class CFinalInput;
struct CFinalInput;
class IDvdRequest;
namespace MP1

21
NESEmulator/CNESShader.cpp
View File

@ -198,11 +198,11 @@ boo::ObjToken<boo::IShaderDataBinding> CNESShader::BuildShaderDataBinding(boo::I
boo::ObjToken<boo::IGraphicsBufferD> uniBuf,
boo::ObjToken<boo::ITextureD> tex)
{
boo::ObjToken<boo::IGraphicsBuffer> bufs[] = {filter.m_uniBuf.get()};
boo::ObjToken<boo::ITexture> texs[] = {filter.m_booTex.get()};
return cctx.newShaderDataBinding(SelectPipeline(type, filter.m_gequal), s_VtxFmt,
filter.m_vbo.get(), nullptr, nullptr, 1, bufs,
nullptr, nullptr, nullptr, 1, texs, nullptr, nullptr);
boo::ObjToken<boo::IGraphicsBuffer> bufs[] = {uniBuf.get()};
boo::ObjToken<boo::ITexture> texs[] = {tex.get()};
return ctx.newShaderDataBinding(g_Pipeline, g_VtxFmt,
vbo.get(), nullptr, nullptr, 1, bufs,
nullptr, nullptr, nullptr, 1, texs, nullptr, nullptr);
}
#endif
@ -253,12 +253,11 @@ boo::ObjToken<boo::IShaderDataBinding> CNESShader::BuildShaderDataBinding(boo::V
boo::ObjToken<boo::IGraphicsBufferD> uniBuf,
boo::ObjToken<boo::ITextureD> tex)
{
boo::ObjToken<boo::IGraphicsBuffer> bufs[] = {filter.m_uniBuf.get()};
boo::ObjToken<boo::ITexture> texs[] = {filter.m_booTex.get()};
return cctx.newShaderDataBinding(SelectPipeline(type, filter.m_gequal,
filter.m_booTex->type() == boo::TextureType::Render), s_VtxFmt,
filter.m_vbo.get(), nullptr, nullptr, 1, bufs,
nullptr, nullptr, nullptr, 1, texs, nullptr, nullptr);
boo::ObjToken<boo::IGraphicsBuffer> bufs[] = {uniBuf.get()};
boo::ObjToken<boo::ITexture> texs[] = {tex.get()};
return ctx.newShaderDataBinding(g_Pipeline, g_VtxFmt,
vbo.get(), nullptr, nullptr, 1, bufs,
nullptr, nullptr, nullptr, 1, texs, nullptr, nullptr);
}
#endif

2
NESEmulator/fixNES

@ -1 +1 @@
Subproject commit 01b5bde49a730eb287b18def7ed5e5f510cda7b5
Subproject commit 25527a513dc635fa87014970618fbfb7dfe3e5c6

4
NESEmulator/malloc.h
View File

@ -3,8 +3,10 @@
#ifdef __APPLE__
#include <stdlib.h>
#elif _WIN32
#include <../ucrt/malloc.h>
#else
#include <../include/malloc.h>
#include_next <malloc.h>
#endif
#endif // URDE_NESEMULATOR_MALLOC_H

2
Runtime/AutoMapper/CAutoMapper.hpp
View File

@ -10,7 +10,7 @@
namespace urde
{
class CFinalInput;
struct CFinalInput;
class IWorld;
class CMapWorldInfo;
class CStateManager;

2
Runtime/CGameDebug.hpp
View File

@ -5,7 +5,7 @@
namespace urde
{
class CFinalInput;
struct CFinalInput;
const char* StringForControlOption(int);

2
Runtime/CGameOptions.hpp
View File

@ -7,7 +7,7 @@
namespace urde
{
class CFinalInput;
struct CFinalInput;
class CStateManager;
/** Options presented in UI */

2
Runtime/CStateManager.hpp
View File

@ -40,7 +40,7 @@ class CActor;
class CLight;
class CDamageInfo;
class CMaterialFilter;
class CFinalInput;
struct CFinalInput;
class CPlayer;
class CWorld;
class CTexture;

2
Runtime/Camera/CCameraManager.hpp
View File

@ -14,7 +14,7 @@ class CGameCamera;
class CCameraShakeData;
class CScriptWater;
class CInterpolationCamera;
class CFinalInput;
struct CFinalInput;
class CScriptCameraHint;
class CCinematicCamera;

2
Runtime/Camera/CGameCamera.hpp
View File

@ -6,7 +6,7 @@
namespace urde
{
class CFinalInput;
struct CFinalInput;
class CGameCamera : public CActor
{

2
Runtime/Character/CBodyController.hpp
View File

@ -12,7 +12,7 @@ namespace urde
class CActor;
class CAnimPlaybackParms;
class CFinalInput;
struct CFinalInput;
class CPASAnimParmData;
class CRandom16;
class CStateManager;

2
Runtime/GuiSys/CGuiFrame.hpp
View File

@ -12,7 +12,7 @@ namespace urde
class CGuiSys;
class CLight;
class CGuiCamera;
class CFinalInput;
struct CFinalInput;
class CGuiLight;
class CVParamTransfer;
class CObjectReference;

2
Runtime/GuiSys/CGuiWidget.hpp
View File

@ -9,7 +9,7 @@ namespace urde
{
class CGuiFrame;
class CGuiTextSupport;
class CFinalInput;
struct CFinalInput;
class CSimplePool;
enum class ETraversalMode

2
Runtime/GuiSys/CHudDecoInterface.hpp
View File

@ -11,7 +11,7 @@
namespace urde
{
class CGuiFrame;
class CFinalInput;
struct CFinalInput;
class CStateManager;
class CGuiCamera;
class CGuiWidget;

2
Runtime/GuiSys/CScanDisplay.hpp
View File

@ -14,7 +14,7 @@ namespace urde
class CGuiTextPane;
class CGuiWidget;
class CGuiModel;
class CFinalInput;
struct CFinalInput;
class CGuiFrame;
class CAuiImagePane;
class CStringTable;

2
Runtime/Input/ControlMapper.hpp
View File

@ -3,7 +3,7 @@
namespace urde
{
class CFinalInput;
struct CFinalInput;
class ControlMapper
{

2
Runtime/MP1/CMessageScreen.hpp
View File

@ -8,7 +8,7 @@
namespace urde
{
class CFinalInput;
struct CFinalInput;
class CGuiWidget;
class CGuiTextPane;
class CGuiModel;

2
Runtime/MP1/CQuitGameScreen.hpp
View File

@ -7,7 +7,7 @@
namespace urde
{
class CFinalInput;
struct CFinalInput;
class CGuiFrame;
class CGuiTableGroup;
class CGuiTextPane;

2
Runtime/MP1/CSaveGameScreen.hpp
View File

@ -13,7 +13,7 @@ class CTexture;
class CStringTable;
class CGuiFrame;
class CSaveWorld;
class CFinalInput;
struct CFinalInput;
class CGuiTextPane;
class CGuiTableGroup;

2
Runtime/Weapon/CPlayerGun.hpp
View File

@ -25,7 +25,7 @@
namespace urde
{
class CFinalInput;
struct CFinalInput;
class CPlayerGun
{

2
Runtime/World/CMorphBall.hpp
View File

@ -19,7 +19,7 @@ namespace urde
class CActorLights;
class CPlayer;
class CDamageInfo;
class CFinalInput;
struct CFinalInput;
class CScriptWater;
class CStateManager;

2
Runtime/World/CPlayer.hpp
View File

@ -17,7 +17,7 @@ class CPlayerGun;
class CDamageInfo;
class CScriptWater;
class IVisitor;
class CFinalInput;
struct CFinalInput;
class CPlayerCameraBob;
class CFirstPersonCamera;
class CCollidableSphere;