From a10e4766dc5e2cb71b211cbf85dd865607bb4735 Mon Sep 17 00:00:00 2001 From: Ethan O'Brien <77750390+ethanaobrien@users.noreply.github.com> Date: Fri, 28 Jul 2023 08:49:10 -0500 Subject: [PATCH] Push beta ppsspp core --- README.md | 2 ++ data/emulator.js | 7 +++++-- data/emulator.min.js | 2 +- index.html | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2dc55b5..b19dfa5 100644 --- a/README.md +++ b/README.md @@ -129,6 +129,8 @@ It is **HIGHLY** suggested that you update to 4.0 ASAP.
+***PSP is not yet supported***. Some of y'all may have seen that I pushed a "beta" ppsspp core, but this core is not ready for daily use. It still crashes randomly and any games that use 3d (so like, all of them) will just have a white screen (and might just crash). Do not open issues related to the "psp" core. + diff --git a/data/emulator.js b/data/emulator.js index 5476ded..500a63f 100644 --- a/data/emulator.js +++ b/data/emulator.js @@ -19,6 +19,7 @@ class EmulatorJS { if (generic) { const options = { 'a5200': 'atari5200', + 'beetle_vb': 'vb', 'desmume2015': 'nds', 'fbalpha2012_cps1': 'arcade', 'fbalpha2012_cps2': 'arcade', @@ -29,7 +30,6 @@ class EmulatorJS { 'handy': 'lynx', 'mame2003': 'mame2003', 'mednafen_psx_hw': 'psx', - 'beetle_vb': 'vb', 'melonds': 'nds', 'mgba': 'gba', 'mupen64plus_next': 'n64', @@ -37,6 +37,7 @@ class EmulatorJS { 'opera': '3do', 'pcsx_rearmed': 'psx', 'picodrive': 'sega', + 'ppsspp': 'psp', 'prosystem': 'atari7800', 'snes9x': 'snes', 'stella2014': 'atari2600', @@ -67,7 +68,8 @@ class EmulatorJS { 'mame2003': 'mame2003', 'arcade': 'fbneo', 'psx': 'pcsx_rearmed', - '3do': 'opera' + '3do': 'opera', + 'psp': 'ppsspp' } return options[core] || core; } @@ -92,6 +94,7 @@ class EmulatorJS { 'opera': ['iso', 'bin', 'chd', 'cue'], 'pcsx_rearmed': ['bin', 'cue', 'img', 'mdf', 'pbp', 'toc', 'cbn', 'm3u', 'ccd'], 'picodrive': ['bin', 'gen', 'smd', 'md', '32x', 'cue', 'iso', 'sms', '68k', 'chd'], + 'ppsspp': ['elf', 'iso', 'cso', 'prx', 'pbp'], 'prosystem': ['a78', 'bin'], 'snes9x': ['smc', 'sfc', 'swc', 'fig', 'bs', 'st'], 'stella2014': ['a26', 'bin', 'zip'], diff --git a/data/emulator.min.js b/data/emulator.min.js index 864c8db..73b8816 100644 --- a/data/emulator.min.js +++ b/data/emulator.min.js @@ -1 +1 @@ -!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("nipplejs",[],t):"object"==typeof exports?exports.nipplejs=t():e.nipplejs=t()}(window,function(){return n=[function(e,t,n){"use strict";n.r(t);function _(e,t){var n=t.x-e.x,t=t.y-e.y;return Math.sqrt(n*n+t*t)}function T(e){return e*(Math.PI/180)}function o(e){f.has(e)&&clearTimeout(f.get(e)),f.set(e,setTimeout(e,100))}function s(e,t,n){for(var i,o=t.split(/[ ,]+/g),s=0;sthis.options.threshold){var r,l={};for(r in this.direction)this.direction.hasOwnProperty(r)&&(l[r]=this.direction[r]);var c={};for(r in this.direction={x:n,y:i,angle:t},e.direction=this.direction,l)l[r]===this.direction[r]&&(c[r]=!0);if(c.x&&c.y&&c.angle)return e;c.x&&c.y||this.trigger("plain",e),c.x||this.trigger("plain:"+n,e),c.y||this.trigger("plain:"+i,e),c.angle||this.trigger("dir dir:"+t,e)}else this.resetDirection();return e};var x=w;function E(e,t){this.nipples=[],this.idles=[],this.actives=[],this.ids=[],this.pressureIntervals={},this.manager=e,this.id=E.id,E.id+=1,this.defaults={zone:document.body,multitouch:!1,maxNumberOfNipples:10,mode:"dynamic",position:{top:0,left:0},catchDistance:200,size:100,threshold:.1,color:"white",fadeTime:250,dataOnly:!1,restJoystick:!0,restOpacity:.5,lockX:!1,lockY:!1,shape:"circle",dynamicPage:!1,follow:!1},this.config(t),"static"!==this.options.mode&&"semi"!==this.options.mode||(this.options.multitouch=!1),this.options.multitouch||(this.options.maxNumberOfNipples=1);e=getComputedStyle(this.options.zone.parentElement);return e&&"flex"===e.display&&(this.parentIsFlex=!0),this.updateBox(),this.prepareNipples(),this.bindings(),this.begin(),this.nipples}E.prototype=new m,(E.constructor=E).id=0,E.prototype.prepareNipples=function(){var i=this.nipples;i.on=this.on.bind(this),i.off=this.off.bind(this),i.options=this.options,i.destroy=this.destroy.bind(this),i.ids=this.ids,i.id=this.id,i.processOnMove=this.processOnMove.bind(this),i.processOnEnd=this.processOnEnd.bind(this),i.get=function(e){if(void 0===e)return i[0];for(var t=0,n=i.length;t