Commit Graph

291 Commits

Author SHA1 Message Date
Henrik Rydgard
cbb786c7f0 Restructure Windows "gameloop" to be more similar to others. 2013-02-19 00:45:25 +01:00
raven02
8425a123e2 Browse and Boot 2013-02-18 03:39:31 +08:00
Unknown W. Brackets
ff8390123a Focus the main window when showing the log. 2013-02-17 00:38:50 -08:00
raven02
9de6b834b9 Fix g_Config.bJit inverted 2013-02-16 21:24:02 +08:00
Henrik Rydgard
37f998407b Replace "Core" with "Jit" in ini. Don't show Open dialog by default (use Ctrl+A or Ctrl+O to open it).
Delete "Slightly Faster Interpreter".
2013-02-16 09:49:33 +01:00
porkness
25562bcea3 Update rc file and update to new version 2013-02-15 20:40:16 +08:00
porkness
b71a510c4c Merge branch 'master' of https://github.com/porkness/ppsspp
Conflicts:
	Windows/ppsspp.rc
2013-02-15 20:33:14 +08:00
Henrik Rydgard
36f49706e0 Add option to stretch to display (turns off the black bars fixing the aspect ratio). 2013-02-13 18:21:21 +01:00
porkness
ba03dcb073 Add a simple Chinese translation for Windows
Also moved original one to en_US to make sure it switch automatically
2013-02-13 12:21:45 +08:00
Henrik Rydgard
3ce4a8a719 Allow switching 2xSSAA on and off ingame. Add Show FPS menu option. 2013-02-11 19:02:38 +01:00
Unknown W. Brackets
e8e9f7f9d8 Add very simple rapid fire for Windows keyboard.
Mostly to speed up debugging.
2013-02-11 01:27:06 -08:00
Unknown W. Brackets
b82feed816 Fix leaking VFS DirectoryAssetReaders. 2013-02-08 19:27:42 -08:00
Henrik Rydgard
5597ab46a7 Make it obvious that we do support XB360 controllers (Windows). 2013-02-06 00:54:52 +01:00
Unknown W. Brackets
cbf9c2dd4a Add a very quick reset command.
Should work unless stop times out.  Helps debugging a bit.
2013-02-02 16:17:35 -08:00
Henrik Rydgard
a953655e80 Fix window title. Also constify some keys. 2013-01-29 22:48:37 +01:00
Henrik Rydgard
260d7d380c 0.6.1 2013-01-29 21:38:54 +01:00
raven02
75c9a13b04 Save fullscreen option to config 2013-01-30 01:12:05 +08:00
raven02
b74b215f34 Add option fullscreen , make default to false 2013-01-27 21:05:09 +08:00
Henrik Rydgard
cb67e0439a Don't try to resize the display if the window size didn't change. 2013-01-27 10:43:21 +01:00
Henrik Rydgard
d1b3fd0e49 Better window resize handling 2013-01-27 00:15:39 +01:00
Henrik Rydgard
2a2f8e6225 Win32: Fullscreen toggle and resizing the window works better. 2013-01-26 23:46:02 +01:00
Henrik Rydgard
021bc613b8 This include doesn't belong 2013-01-26 22:00:52 +01:00
Henrik Rydgard
d745d57730 Add (hardcoded) option for creating a debug gl context 2013-01-26 21:39:36 +01:00
Henrik Rydgard
1ed9a6ba56 Small fixes. v0.6. 2013-01-26 21:39:35 +01:00
Darth1701
69bec091e1 Update Windows/PPSSPP.sln
Fix for VS 2010
2013-01-23 13:08:51 +01:00
Unknown W. Brackets
04130c812a Show the current tick count in the disasm dialog.
Might as well show something under Ctr:...
2013-01-21 19:20:49 -08:00
Henrik Rydgard
04860322f4 Merge branch 'master' into vertexcache 2013-01-20 11:30:11 +01:00
Unknown W. Brackets
9d8a9a1dd0 Couple more type conversion errors, cleanup. 2013-01-19 14:05:46 -08:00
Henrik Rydgard
8ff96bbcd8 Defer vertex decoding until flush. Track draw calls so that they can be cached later. 2013-01-19 17:05:50 +01:00
Darth1701
e6a85eb7df Update Windows/PPSSPP.sln 2013-01-19 11:11:20 +01:00
Henrik Rydgard
7b13477fda Add UnitTest project (only set up win build for now, lazy me)
This is for local testing of stuff that doesn't need to be tested
in context in the emulator.
Enable building ArmEmitter under any platform, just for testing.
2013-01-19 10:07:14 +01:00
Henrik Rydgård
f493aad0fe Merge pull request #425 from raven02/g3d-log
Minor fix disable G3D log at startup
2013-01-16 00:08:09 -08:00
raven02
dde889d2e3 Minor fix disable G3D log 2013-01-16 08:37:41 +08:00
Henrik Rydgard
8ce9ce10bf Merge branch 'master' into armjit
Conflicts:
	Common/ArmEmitter.h
	Common/CPUDetect.cpp
2013-01-14 20:46:17 +01:00
raven02
113706ad49 Add UpdateMenus() to ID_OPTIONS_FULLSCREEN 2013-01-12 14:45:28 +08:00
Henrik Rydgard
551bf7b0ad Let's build for both armeabi and armeabi-v7a again. 2013-01-11 19:40:33 +01:00
Henrik Rydgard
2e6063d084 Merge branch 'master' into armjit 2013-01-11 18:01:32 +01:00
raven02
e34ba40519 Add option to disable G3D log 2013-01-11 16:14:58 +08:00
Henrik Rydgard
c7a137a930 Merge branch 'master' into armjit
Conflicts:
	android/jni/MenuScreens.cpp
2013-01-10 12:57:45 +01:00
Henrik Rydgard
479d1f5111 Draw using VBO. Add option, make default true. 2013-01-10 12:54:36 +01:00
J.P. Lee
eda8252d7d Implement a simple SSAA function
Seems that 2x has the best effect for now but this is not the best way
of implementing AA function because it requires much greater video card
memory and memory bandwidth than other avaible methods like MSAA, CSAA
etc.
2013-01-10 10:28:49 +08:00
Henrik Rydgard
f5c94775b9 Cleanup 2013-01-09 00:12:02 +01:00
Henrik Rydgard
8c06edc47b It's getting close to the first totally unoptimized jit run. 2013-01-08 17:03:17 +01:00
Henrik Rydgard
7cb95bbc89 Merge branch 'master' into armjit
Conflicts:
	CMakeLists.txt
	Core/MIPS/ARM/RegCache.cpp
2013-01-07 10:25:02 +01:00
Unknown W. Brackets
f546e9084f Use 100% because 80% is in some games' deadzone.
Like Senjou no Valkyria 3.  Also some games register it but move slow.
2013-01-06 22:57:33 -08:00
Unknown W. Brackets
cf1295e95f Enable fake mpeg mode by default.
Note: loaded save states will have it off.  No UI yet.
2013-01-06 19:55:04 -08:00
Henrik Rydgard
9363a867e2 Add glViewport to cached gl state. Add a couple of missing VFPU ops. 2013-01-06 23:23:36 +01:00
Henrik Rydgard
4f63bda419 Add Windows UI to dump next frame to log (display list commands) 2013-01-05 19:57:06 +01:00
raven02
bb9d2dbea8 Run should be grayed when emulation is running 2013-01-05 21:41:21 +08:00
Henrik Rydgard
5066df5881 0.5 2013-01-04 14:33:24 +01:00
Henrik Rydgard
a9c171c786 Fix bAutoRun config option, add to menu. (Run on Load). 2013-01-04 10:26:14 +01:00
Henrik Rydgard
fb487ded17 Windows: Add ugly dialog that just shows controls for now. Also had VS rewrite the .rc file for me, looks neater. 2013-01-02 22:57:57 +01:00
Henrik Rydgard
883f61e3dd Savestates: Add quicksave/quickload. Add Android UI for savestates. All single slot for now. 2013-01-02 21:05:02 +01:00
Unknown W. Brackets
e3943c390a Arg, I got these backwards. 2012-12-29 16:13:54 -08:00
Henrik Rydgård
acd1457308 Merge pull request #288 from unknownbrackets/savestates
Save more of the GPU's state, fix a crash
2012-12-29 15:34:57 -08:00
Unknown W. Brackets
8c98c7b141 Reverse the analog Y for everyone.
Verified XInput is still happy this way.
2012-12-29 13:01:10 -08:00
Unknown W. Brackets
020f69e5fb Pause before browsing for a state file on Windows. 2012-12-29 12:50:13 -08:00
Henrik Rydgård
ec080eb2b6 Merge pull request #281 from unknownbrackets/savestates
Savestate tweaks (gzip, Windows cli/UI cleanup)
2012-12-29 00:47:09 -08:00
Henrik Rydgård
17eec66a04 Restore run/pause shortcut. Reset doesn't need a shortcut. 2012-12-29 09:07:04 +01:00
raven02
b94bcad288 Fall back to original filter logic when filter option is off 2012-12-29 09:48:46 +08:00
Unknown W. Brackets
da551d71c3 Disable load/save while no iso loaded. 2012-12-28 17:24:14 -08:00
Unknown W. Brackets
14ef840dd3 Add a command line option to load a state.
For debugging.
2012-12-28 17:23:05 -08:00
Henrik Rydgård
90e3042b17 Change save state extension to ".ppst" 2012-12-28 23:43:09 +01:00
Unknown W. Brackets
94969c4ead Add some basic Windows UI for save states. 2012-12-28 13:55:32 -08:00
Unknown W. Brackets
3872753b8a Highlight changed regs in the Windows debugger. 2012-12-26 11:32:51 -08:00
Unknown W. Brackets
1d7a42f0b8 Add a button on Windows to enable HLE stepping. 2012-12-24 21:50:02 -08:00
Unknown W. Brackets
cd407dc84c In Windows, disable run/reset/pause when closed.
Saw this a lot while testing and couldn't help but fix it.
I know this is probably going away soon.
2012-12-23 23:56:49 -08:00
Unknown W. Brackets
5163745871 Switch the Windows RC file to UTF-16.
UTF-8 not supported, and the encoding got messed up.
This should keep it correct.

Contents not changed.
2012-12-23 23:43:57 -08:00
Unknown W. Brackets
ecffa492f6 Refactor Windows show log switch. 2012-12-22 09:54:07 -08:00
Unknown W. Brackets
7aa7640e87 Add -f switch for parody with Headless. 2012-12-22 09:49:59 -08:00
Unknown W. Brackets
7fb65a5997 Add a switch to Windows to save to a log file. 2012-12-22 09:49:29 -08:00
Unknown W. Brackets
d745bddc23 Enable a few command line switches on Windows. 2012-12-22 09:21:23 -08:00
Unknown W. Brackets
15793fe532 More minor static analysis warning fixes. 2012-12-21 17:00:47 -08:00
Unknown W. Brackets
217bdc275e Fix some type-conversion warnings. 2012-12-21 16:07:38 -08:00
Henrik Rydgård
b486ca1620 Merge pull request #215 from raven02/fast-mem
Quick add checkitem for option fast memory
2012-12-21 12:58:10 -08:00
raven02
88578cc525 Quick add checkitem for option fast memory 2012-12-22 00:49:53 +08:00
Henrik Rydgard
2ec8606fcb Flip Y axis for xinput 2012-12-21 17:13:00 +01:00
Henrik Rydgard
f5efd6f2b1 JIT: add option to enable/disable jit of memory instructions. for crash safety. 2012-12-21 16:50:13 +01:00
Henrik Rydgard
4bf2e52623 HW transform: Avoid 4x3 matrices for GLES 2.0 compat. Add option to turn hw transform on. 2012-12-21 11:08:54 +01:00
Henrik Rydgard
4046146164 Add experimental wireframe mode for debugging. Fix texenv color. Code cleanup. 2012-12-19 15:14:41 +01:00
Henrik Rydgård
a375dcb97c Merge pull request #195 from raven02/fs-fix
Quick viewport fix for fullscreen mode
2012-12-18 04:15:29 -08:00
raven02
478c5074e4 Quick viewport fix for fullscreen mode 2012-12-18 19:56:35 +08:00
Henrik Rydgard
624927cd9a Make the windows port find ppge_atlas in the assets subdirectory. 2012-12-17 22:24:07 +01:00
Henrik Rydgard
a60d487d8d Create files for sceUsb 2012-12-17 21:45:32 +01:00
Henrik Rydgard
11279668ca Allow changing of zoom factor at runtime 2012-12-17 21:06:47 +01:00
raven02
fb5a26b46d Enable correct viewport switching for screen 1x-4x and add Ctrl1-4 as shortcut key 2012-12-16 17:57:33 +08:00
Unknown W. Brackets
c55ee023e1 Add project Dialog filter, suppress some warnings. 2012-12-10 08:21:05 -08:00
TMaul
b7b40ba6d6 Make the flash filesystem a real directory
Not really needed yet, but it will be.
2012-12-09 23:32:44 +00:00
Henrik Rydgård
e724d82c46 Merge remote-tracking branch 'origin' into armjit
Conflicts:
	CMakeLists.txt
2012-12-09 09:54:58 +07:00
jacky400
8ce8400bae Update Windows/ppsspp.rc 2012-12-05 16:55:02 +08:00
jacky400
7c70a2048a Update Windows/ppsspp.rc 2012-12-05 14:40:13 +08:00
jacky400
284597582c Update Windows/WndMainWindow.h 2012-12-05 14:32:32 +08:00
jacky400
b49e053edd Update Windows/WndMainWindow.cpp 2012-12-05 14:31:41 +08:00
jacky400
a072fff4d4 Update Windows/WndMainWindow.cpp 2012-12-05 00:05:36 +08:00
Unknown W. Brackets
346095d5f0 SetWindowText() was doing ANSI conversion. 2012-12-03 07:57:28 -08:00
Unknown W. Brackets
ad59c7f46d Convert the title to wchars to fix non-ASCII. 2012-12-03 07:44:29 -08:00
jacky400
d91314d906 Update Windows/main.cpp
Increase windows scheduling resolution
2012-12-03 16:44:37 +08:00
Unknown W. Brackets
958fd29593 On Windows, separate analog and digital arrows.
This fixes the Tales of Eternia menu and movement.
2012-12-02 16:04:50 -08:00
Florent Castelli
952a937fe7 Revert changes in RC file that were breaking debug build on Windows.
If the build isn't working on VS Express, notify me so we can find a fix.
2012-12-02 03:00:36 +01:00
Henrik Rydgard
815c3240bc V4 2012-12-01 10:44:37 +01:00
Henrik Rydgard
a5e35ad6d9 Parse PARAM.SFO to get the disc ID, show in title bar on Windows 2012-11-30 22:32:51 +01:00
Henrik Rydgard
e370a1a8aa Fix project and .rc so it builds with VS 2010 Express, thanks Darth1701. Plus logging tweaks. 2012-11-29 10:41:48 +01:00
Henrik Rydgard
d8c92caad9 Safer matrix loading. Change default G3D log level from Notice to Error. 2012-11-26 18:04:34 +01:00
Henrik Rydgard
870ea6628b Reasonably correct viewport handling. Optional debug stats overlay (not always 100% working). 2012-11-26 17:35:08 +01:00
Sacha
b76152d88a Use gl_common from native. 2012-11-26 20:38:39 +10:00
Unknown W. Brackets
063f914ff3 Fix project files so things build again. 2012-11-24 09:20:53 -08:00
Florent Castelli
56175bc505 Defer blend, cull and depth test changes to draw command
Avoid unnecessary state changes and reduces the amount of OpenGL calls.
It also puts all the interesting logic at the same place, reducing the
complexity a little.
2012-11-24 15:19:29 +01:00
Henrik Rydgard
265e70a498 Just some sketchwork on a JIT for ARM. When completed, will bring speed to mobile devices. 2012-11-23 19:41:35 +01:00
Henrik Rydgard
a97f66766d Add "slightly faster interpreter", optimizing the most common instrs. Not as helpful as I thought it would be on Android, really need a proper JIT. 2012-11-23 12:42:35 +01:00
Unknown W. Brackets
f41445354c Correct stdafx.h path in project file. 2012-11-22 13:21:48 -08:00
Diogo Franco (Kovensky)
6108e36ae9 Several fixes to build under stricter C++11
Add missing #include to various files.

strings.h isn't provided by MSVC so we don't include it there; it's needed
for other OSes/compilers.

Get rid of pre-ISO-C malloc.h includes; malloc is provided by stdlib.h.

Fixes some linuxisms.

Prepend __builtin_ to __clear_cache, calling it without the prefix is a
GNU extension.
2012-11-21 14:33:50 -03:00
Diogo Franco (Kovensky)
cd93e49584 Move toplevel windows-specific files to the Windows dir 2012-11-21 14:33:38 -03:00
Henrik Rydgard
45369af482 0.31 in the UI 2012-11-20 22:41:24 +01:00
Henrik Rydgård
2a56d36b12 glViewport calls need to be in pixel coordinates. 2012-11-20 16:48:24 +01:00
Henrik Rydgard
4c2929cf13 v0.3 2012-11-20 11:54:51 +01:00
Henrik Rydgard
4b87da74cb windows gui option for buffered rendering. Misc fixes, prettier checkbox on android. 2012-11-20 11:35:48 +01:00
Henrik Rydgard
91e1cce17e Some reorg in preparation for FBO work 2012-11-19 21:23:29 +01:00
Henrik Rydgard
e37a1fb1d3 Add internal 2D drawing library that goes through the Ge emulation for portability.
To be used for things like sceUtility* and other overlays like FPS and stats.
2012-11-18 13:04:49 +01:00
Henrik Rydgard
7720dc3f60 Various warning, logging, jit fixes 2012-11-17 19:56:28 +01:00
Henrik Rydgard
9165c0b3a9 Add zoom setting to Windows version. Doesn't work while playing. 2012-11-17 17:46:05 +01:00
Henrik Rydgard
423bba5d8d Some optimization and minor fixes 2012-11-17 15:06:10 +01:00
Henrik Rydgard
e5c6cf965b Fixes and optimizations to vertex decoding and lighting.
Motorcycles are now visible in MotoGP.
2012-11-16 15:16:14 +01:00
Florent Castelli
65a89d08b8 Define XUSER_MAX_COUNT for those who don't have the DirectX SDK 2012-11-15 01:51:39 +01:00
Henrik Rydgard
8a8a4fa736 Fix the list of libraries for one more build type in the vcxproj 2012-11-14 12:56:55 +01:00
Henrik Rydgard
059bb3c40c Buildfix, bugfix. Fixes issue 46. 2012-11-13 20:10:48 +01:00
Unknown W. Brackets
6ea152e164 Add XInput.lib to other configurations.
Makes 64 bit etc. work as well.
2012-11-13 01:53:45 -08:00
Unknown W. Brackets
b468800155 Add XInput.lib to the Release configuration.
Was added to debug only, so Release doesn't build, preventing tests.
I think x64 is broken also.
2012-11-13 01:19:00 -08:00
Diogo Franco (Kovensky)
7e7e9a0452 Add a class for keyboard input
Removes the windows-specific hack from sceCtrl
to read keyboard input and instead add a hack to
PPSSPPWindows.

The input mapping is still hardcoded and is the same
as it was in sceCtrl.

Add an std::list to WindowsHost that, curretly, contains
a hardcoded list of preferred `InputDevice`s. Devices
are tried in-order until one of them reports success.
Xinput is preferred over Keyboard. Keyboard always
returns success. Pointers are stored in the std::list
for polymorphism.

Change XinputDevice to report failure as soon as a
device can't be queried, instead of only a frame later.
2012-11-12 17:49:40 +00:00
Diogo Franco (Kovensky)
2210b19244 Xinput input support
Picks the first Xinput device available, waits 100 frames between
retries when no devices are available.

Controls are hardcoded so every x360 controller button corresponds
to the PSP button in the same physical position. Input from right
stick and from analog triggers is ignored.

The Xinput code though is overriden by SampleControls' hardcoded
keyboard input. XinputDevice was tested to work with
samples/controller/basic when SampleControls is disabled.
2012-11-12 17:40:01 +00:00
Henrik Rydgard
54329ad560 Merge branch 'master' of github.com:hrydgard/ppsspp 2012-11-10 23:26:05 +01:00
Henrik Rydgard
6c160ee7fc 0.2 2012-11-10 16:39:42 +01:00
gigaherz
b45209c872 Normalize line endings in ppsspp.rc 2012-11-10 12:17:07 +01:00
Henrik Rydgard
387552f564 Misc fixes (accept .prx, work on power callbacks, bugs) 2012-11-10 10:15:11 +01:00
Henrik Rydgard
ac910d7e75 Fix Windows and Android builds. 2012-11-05 15:42:21 +01:00
Arthur Blot
5b5618d32d Added ~PSP decryption system using kirk-engine 2012-11-05 14:59:38 +01:00
Henrik Rydgård
c39d9a8397 Merge pull request #10 from xsacha/master
Blackberry 10 port (WIP)
2012-11-05 05:35:02 -08:00
Sacha
41f5abab31 PPSSPP ported to Blackberry10
Now builds on Playbook and Dev Alpha
Make emulator more compatible with other OS (case sensitivity, defines, includes)
Uses Android's code paths and backend
2012-11-05 23:09:49 +10:00
Henrik Rydgard
b963990449 Fix cancelled-boot crash on Windows 2012-11-05 13:42:33 +01:00
Henrik Rydgard
64cc573703 Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK. 2012-11-04 23:24:00 +01:00
Henrik Rydgard
907e2e2765 Add a missing file that gitignore caught 2012-11-04 21:06:39 +01:00
Henrik Rydgard
4f7ad15758 Add snapshot of the whole source code. 2012-11-01 16:19:01 +01:00