Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-23 14:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
571 commits 5 branches 36 tags 656 MiB
Commit graph

497 commits

Author SHA1 Message Date
Aloshi 3a3471cfe8 Combined FolderData and GameData into one class, FileData. 
You don't need to dynamic_cast everywhere to check things anymore.
Folders can have metadata now (currently not set up).
Metadata is now a public member variable instead of a function that
returns a pointer to make actually using const possible.
 2013-11-05 19:41:49 -06:00
Aloshi 5c65747551 Moved metadata type declarations more behind-the-scenes. 
The original plan was to allow each system to have customizable lists of
metadata, which made constructing metadata really painful (the declaration
list isn't stored on the metadata instance because that's pretty wasteful
for 2,000 games).  Now they're constructed by passing a MetaDataListType
enum in the constructor.
Declaration lists are now managed by const globals passed by reference
through getMDDByType(MetaDataListType).
 2013-11-03 19:54:13 -06:00
Aloshi 626a2692e5 Removed an unnecessary path.string() during folder population. 2013-10-27 11:18:38 -05:00
Aloshi fb55b1cd91 Limit OptionListComponent to 5 entries on screen. 
Can now hold up/down to scroll OptionListComponent.
 2013-10-26 15:57:46 -05:00
Aloshi 68841aa654 SystemData now stores extension lists as a vector internally. 
Don't write gamelist.xml changes if IGNOREGAMELIST is true.
 2013-10-26 14:08:53 -05:00
Aloshi 20c367daa7 Fix DateTimeComponent not consuming input when leaving edit mode. 2013-10-24 11:48:29 -05:00
Aloshi a666415302 I forgot how to #ifdef apparently 2013-10-24 11:47:09 -05:00
Aloshi 81e2f2d783 Specify for SDL to use OpenGL ES 1.x 2013-10-24 16:43:54 +00:00
Aloshi afdd5f2862 Fixed building on Linux. 2013-10-18 14:53:14 -05:00
Aloshi a554fea973 Fixed memory leak with FolderData::removeFileRecursive. 
Made "DELETE" actually work in GuiMetaDataEd.
"DELETE" option also now asks if you're sure.
GuiMetaDataEd can be closed with the "b" button now.
GuiGameScraper now tries to put the cursor on the first game if there is
one when a search completes.
 2013-10-16 18:46:05 -05:00
Aloshi 9867e902de Fixed a Settings loading bug that would cause values from other types to 
get loaded into a map.
Added a "Released:" label for release date on GuiGameList.
 2013-10-16 18:20:21 -05:00
Aloshi 36ecb83d8d Added color/font settings for DateTimeComponent. 
Added "release date" entry to GuiGameList.
 2013-10-16 18:11:43 -05:00
Aloshi 89fca2b875 Create folders when writing a new gamelist.xml if necessary. 2013-10-16 17:49:43 -05:00
Aloshi bff7920f14 Added "Scrape Ratings" option to settings menu. 
Finally changed the stupid "SAVE" label hack to an actual ButtonComponent.
 2013-10-16 17:14:50 -05:00
Aloshi 56b04aec4c updateGamelist now creates a gamelist.xml if one does not exist. 
Added GuiMsgBoxOk and GuiMsgBoxYesNo, basic message boxes.
Added rating scraping to TheGamesDB scraper.
Added warning if platform ID is not set for a system the user has selected
to scrape.
 2013-10-16 17:05:02 -05:00
Aloshi 12dd8b028d Disable sleep mode while scraping. 
Fix to actually update metadata.
Write changes to gamelist.xml after each game is done.
 2013-10-13 16:40:36 -05:00
Aloshi 69852af751 Multi-game scraper seems to be functional! 2013-10-13 14:07:48 -05:00
Aloshi d419bb368a Added GuiMsgBoxOk. 2013-10-12 15:08:27 -05:00
Aloshi 9b1ba71fa3 Reworked OptionListComponent to push a second component when editing the 
list to fix the "draw order" problem.
 2013-10-12 14:03:32 -05:00
Aloshi ff85f971b2 More work on multi-game scraping UI. 2013-10-10 19:55:57 -05:00
Aloshi f3695a7545 Started work on "scrape multiple games" UI. 2013-10-10 16:49:59 -05:00
Aloshi e247326b51 Better opacity support for TextComponent 2013-10-10 16:14:33 -05:00
Aloshi 2aad9cbdeb Fix building on Linux 2013-10-10 15:55:54 -05:00
Aloshi dca5467f7b Boost.Asio -> libcurl to hopefully fix the Linux bugs. 2013-10-10 13:11:01 -05:00
Aloshi 4e2b57c001 Image downloading is now async for GuiMetaDataEd. 
GamesDBScraper now uses system->getPlatformId() if set.
 2013-10-09 19:50:42 -05:00
Aloshi 0fa4cf527b Fixed SDL2 warnings on Linux (-W-no-attributes). 
Fixed #include for old Font.h location in Renderer_init_sdlgl.cpp.
 2013-10-08 16:31:29 -05:00
Aloshi 5d6192613c You can now choose a scraper in the Settings menu. 2013-10-05 21:56:06 -05:00
Aloshi 63d8908061 Synchronous scraper image downloading. 
Code is there for async, just not hooked up to the UI yet.
 2013-10-05 15:28:59 -05:00
Aloshi a6dbaa2dea Moved Font.h/.cpp to the "resources" directory (since it's a Reloadable). 2013-10-04 18:24:41 -05:00
Aloshi b510aa8cd4 Moved ResourceManager to be a singleton. 
The character count of the average Font::get decreased by 310%...
 2013-10-04 18:10:39 -05:00
Aloshi a4185176da OptionListComponent 2013-10-03 16:50:40 -05:00
Aloshi 6956211ff0 Started on OptionListComponent. 2013-10-01 16:52:30 -05:00
Aloshi e7135d869c Updated README.md and --help command. 2013-09-30 14:34:22 -05:00
Aloshi bbc387ce8a Initial command-line scraper. 2013-09-28 21:54:15 -05:00
Aloshi 838b8ee422 DateTimeComponent. 
Can display dates, date + times, and an english description of a time
relative to now ("2 secs ago", "1 day ago", etc.).
Supports editing dates (including day-of-month validation).
This took a lot longer than I thought.
 2013-09-28 17:35:38 -05:00
Aloshi 7db0100edd Use boost::posix_time::ptime internally for times and dates. 2013-09-28 12:51:16 -05:00
Aloshi 7bd34ec62a Added "isStatistic" property to MDDs. 
If true, ignore scraper values for this value.
This keeps scraping from overwriting playcount and lastplaytime.
 2013-09-28 11:38:31 -05:00
Aloshi cfd63c74db Refactored GameData to be completely independent of SystemData. 2013-09-28 11:18:44 -05:00
Aloshi c5d772657b Added PlatformId to SystemData. 2013-09-28 11:10:06 -05:00
Aloshi 10ed603f27 Unified renderer initialization on RPi and other platforms! Woo, SDL2! 2013-09-28 01:17:41 +00:00
Aloshi 71f0dbf7e5 Revert "Merge pull request #134 from elpendor/unstable" 
This reverts commit 896e0f460b, reversing
changes made to 56b5127200.
 2013-09-25 14:38:53 -05:00
Juan Pablo 8c768e057d Replaced boost's regex with std's regex 2013-09-25 01:07:11 -03:00
Aloshi 56b5127200 Fix HttpReq destructor freeze on Linux 2013-09-24 16:35:48 -05:00
Aloshi 69ef41a49f Add boost-regex to required libs. 
Added PlatformId.h.
 2013-09-24 16:27:20 -05:00
Aloshi 153aee5040 Use RatingComponent in the metadata editor. 2013-09-24 14:44:18 -05:00
Aloshi fb8bfc9486 Added "releasedate" to the MetaDataDecl list. 2013-09-24 13:41:19 -05:00
Aloshi b2f615347e IScraper renamed to Scraper. 
Scraper now contains a partial implementation since almost all scrapers
will follow the pattern of create HttpReq -> create and wait for
AsyncReqComponent -> parse HttpReq contents.
 2013-09-24 13:06:13 -05:00
Juan Pablo a8427d33a6 Partial implementation for The Archive scraper. 2013-09-24 04:26:33 -03:00
Juan Pablo 2999a8068a Properly encoded parameters. Otherwise the query gets truncated. 2013-09-24 04:02:14 -03:00
Juan Pablo 3e1ecb4a84 Added a method to clean filenames before scraping 2013-09-24 02:20:53 -03:00
Juan Pablo 57eb9849ff Renamed/moved maximum scraper results constant to be used in scraper 2013-09-24 01:58:59 -03:00
Aloshi 51e797bbd0 RatingComponent mostly working. 2013-09-23 21:02:41 -05:00
Aloshi 964d5afc56 Work on RatingComponent 2013-09-23 14:58:47 -05:00
Aloshi e65d94fe54 Initialize std::functions with nullptr instead of NULL. 2013-09-22 19:40:51 -05:00
Aloshi 8a0eff8ef6 Fix wrapping text that ends with a newline. 2013-09-20 22:06:50 -05:00
Aloshi a3a4636fd5 Search for box hooked up. 
Display thumbnails for results.
Still need to resolve boxart.
 2013-09-20 18:55:05 -05:00
Aloshi 9ce511cc71 Partial implementation for TheGamesDB scraper. 
Still needs a way to display error messages.
 2013-09-20 14:55:44 -05:00
Aloshi 3105073e50 Work on scraper UI integration (about there, just need a real scraper 
now).
 2013-09-19 18:41:14 -05:00
Aloshi 5dfaeeabb4 More infastructure for scrapers (starting to hook into GuiMetaDataEd). 2013-09-17 16:50:49 -05:00
Aloshi fe991e1b86 Skeleton for scrapers. 2013-09-16 14:53:24 -05:00
Aloshi e823592660 Added AsyncReqComponent for easy asynchronous, cancelable HTTP requests with a nice loading icon. 2013-09-15 14:11:39 -05:00
Aloshi c807c98b4a Added HttpReq class based on Boost.Asio. 2013-09-15 12:56:47 -05:00
Aloshi 8e12ff9506 Completely removed GuiBox. 2013-09-14 12:51:13 -05:00
Aloshi d7a6cae4ce Moved the fast select GUI to nine patches. 
Luckily, no one ever used it anyway.
 2013-09-14 12:32:21 -05:00
Aloshi b0d156d6bd Move GuiSettingsMenu to use NinePatch. 2013-09-14 11:14:21 -05:00
Aloshi 74e8c40d67 Moved TextEditComponent to use NinePatchComponent. 
Enable key repeat while text editing.
 2013-09-14 10:58:34 -05:00
Aloshi 861a61cb3a Set *all* the vertex data to zero for newlines. 2013-09-13 14:01:39 -05:00
Aloshi 376d746686 Fix newlines not initializing font vertices. 2013-09-12 16:56:42 -05:00
Aloshi 8bd5966f87 Added single-line edit + view mode to TextEditComponent. 
Used automatically if component height <= font height.
 2013-09-12 16:35:44 -05:00
Aloshi f9571b9389 TextEditComponent is now fixed-height and supports cursor-based editing. 
Fixed a text-wrapping bug with consecutive newlines in Font::wrapText.
 2013-09-07 17:46:26 -05:00
Aloshi 044619a2d3 Add ALSA package to dependency list. 
Change name of example config from "NES" to "nes".
 2013-08-28 14:39:29 -05:00
Aloshi 268b918c46 Changed GuiGameEd to GuiMetaDataEd. 
Now accepts std::functions for save/delete.
 2013-08-23 17:15:00 -05:00
Aloshi e55e0f3da7 Added FolderData::removeFileRecursive(FileData* f). 
Fixed ButtonComponent crashing when pressed with no press func set.
 2013-08-23 12:21:22 -05:00
Aloshi f2689f49a6 Merge branch 'master' into unstable 2013-08-23 11:28:45 -05:00
Aloshi b76413137e Hopefully fix trying to showing too many entries in TextListComponent. 2013-08-23 11:21:00 -05:00
Aloshi f89a418b5c Moving from GuiBox to simple mobile-style Nine Patches. 2013-08-23 09:53:48 -05:00
Aloshi 77fb840a4b Added a basic ButtonComponent class. 2013-08-22 15:29:50 -05:00
Aloshi df897c0b5a Finally implemented TextCaches for TextComponent and TextEditComponent. 
Huge boost in performance with rendering game descriptions.
(It's About Damn Time (TM))
 2013-08-21 20:08:36 -05:00
Aloshi 11f774e019 Cache the result of Font::getDefaultPath(). 
(According to Very Sleepy, this was taking up 39% of render time :))
 2013-08-21 16:18:20 -05:00
Aloshi bde5b6888f Properly fill in display_width and display_height for 0 now. 2013-08-21 15:59:11 -05:00
Aloshi bed9c1fbb5 TextEditComponents now resize vertically as needed. 2013-08-21 14:49:33 -05:00
Aloshi 7cb3cc09ee Fixed a long-standing invalid OpenGL disable in drawRect. 
Fixed a really strange bug in ComponentList vertical centering
that was causing TextEditComponent to render the top GuiBox border
incorrectly with odd sizes.
 2013-08-21 12:40:39 -05:00
Aloshi 7c2e7f9069 Basic text editing support. 2013-08-19 10:36:48 -05:00
Aloshi 1418f85ba7 Fixed some subtle bugs with SDL2 joystick changes. 
Removed platform-specific input device list polling.
Now we use SDL2's handy SDL_JOYDEVICEADDED event.
 2013-08-19 09:05:30 -05:00
Aloshi 5b1cd8fbf8 Renderer compiles on the Pi again. 
For some reason SDL2 won't initialize on the terminal though.
Works fine under X, though that isn't an acceptable solution.
 2013-08-18 19:31:35 +00:00
Aloshi 09726348b3 Moved to SDL2. 
Renderer on the Pi doesn't work at the moment.
 2013-08-18 12:17:52 -05:00
Aloshi b5fe2cc8fc Began work on the metadata editor. 2013-08-18 09:16:11 -05:00
Aloshi 421797929d New generic metadata backend. 2013-08-14 07:16:49 -05:00
Aloshi dbcb9aed37 Moved es_systems.cfg to use XML. 
Updated README.md to reflect new format.
"descname" has been renamed to "fullname".
 2013-08-13 01:56:10 -05:00
Aloshi c7a150046a Re-added the old fix for the "automatically starting emulator" bug that 
got removed during refactoring.
 2013-08-08 19:15:50 -05:00
Aloshi 60adf05077 Use res2h-generated files for embedded resources. 
You do not need res2h to build ES, only if you wish to modify resource
files.
Added a simple corner.png and bar.png for a border in the settings menu.
Added ImageComponent::setColorShift(unsigned int color) to change the
OpenGL color array.
 2013-08-07 17:40:27 -05:00
Aloshi 4f416d13a0 Add a "disable sounds" option to the settings menu. 2013-08-07 00:41:55 -05:00
Aloshi eb2481ca19 Remove debug text. 2013-08-06 23:46:43 -05:00
Aloshi 92adc41cd6 Fixed really sneaky texture deallocation bug. 
Textures allocated with no path (e.g. the transition image which uses
copyScreen()) weren't being deinitialized with the renderer.  Which meant
something else could take the old texture ID, and when the no-path texture
got destroyed, it would take a texture along with it.
 2013-08-06 23:35:06 -05:00
Aloshi 55b71fab49 Fixed ScrollableContainer clipping. 
Changed game select effect to interpolate more interestingly.
 2013-08-06 22:46:25 -05:00
Aloshi 541d9a62d1 Fix vertical and horizontal GuiBox images being flipped. 2013-08-06 19:03:40 -05:00
Aloshi bd940c56b4 Added new game launch/return effect. 2013-08-06 08:15:20 -05:00
Aloshi 04ffc7447c Fix mis-declared render methods for input setup GUIs. 2013-07-26 18:28:51 -05:00
Aloshi a82684ec1a Remove GuiComponent::init, deinit, and getGlobalPosition. 2013-07-23 06:15:10 -05:00
Aloshi 8d78052808 Finally use parenting in GuiGameList. 
Added setCentered(bool) to TextComponent.
Fixed Font::sizeWrappedText to return an accurate width.
 2013-07-23 01:27:28 -05:00
Aloshi e2c30a568d Added a Window::normalizeNextUpdate() method. 
If you know something is about to cause the framerate to tank (e.g. theme
loading), you can tell the next update to be, at maximum, the average of
the previous five seconds of frames.
The framerate drawing code has also been moved to Window.
 2013-07-17 01:47:02 -05:00
Aloshi 7698c8fe74 Increment version number. 2013-07-17 00:56:10 -05:00
Aloshi 9fe6ca7506 Fix projection matrix on the Raspberry Pi. 2013-07-17 00:50:38 -05:00
Aloshi 28f7a9c6e1 Fix Settings menu and associated components. 2013-07-16 23:18:30 -05:00
Aloshi 8bd87e162c Stop including Eigen directly in the project. 
Update README.md for information on installing Eigen.
 2013-07-16 22:41:39 -05:00
Aloshi 19c585ec22 Fix font texture filter (to be GL_NEAREST). 2013-07-15 22:57:50 -05:00
Aloshi 542d41c682 Move from homegrown Vector2 class to Eigen. 
Pass a matrix (Eigen::Affine3f) in GuiComponent::render instead of doing
glTranslate behind the scenes.
 2013-07-10 06:29:43 -05:00
Aloshi 919662be85 Merge branch 'master' into unstable 2013-07-09 19:03:46 -05:00
Aloshi 7085d74e31 Changed default centering behavior. 
Now the detailed view will default to left-aligned.
 2013-07-09 19:02:59 -05:00
Aloshi a15031733b Fix crash when no fast-select font specified 2013-07-09 18:52:10 -05:00
Aloshi 77e9f2d150 Refactor some of the startup code. 2013-07-09 05:37:37 -05:00
Aloshi 40dc9abdf8 Fix GuiGameList list positioning. 2013-07-09 01:10:48 -05:00
Aloshi dd10edb904 ResourceManager stores Reloadables in a list, instead of vector. 2013-07-09 00:57:28 -05:00
Aloshi a818801ea6 Initialize mOpacity. 2013-07-09 00:48:23 -05:00
Aloshi c8900f4099 Moved to class-individualized static gets for resources. 
See issue #95 for discussion.
 2013-07-09 00:44:24 -05:00
Aloshi c99324060b Merge branch 'master' into unstable 2013-07-08 19:06:55 -05:00
Bim Overbohm 3c189b33c1 Convert paths to generic form after 341aa766d8 
Might not have caught all places where this should be done.
 2013-07-03 14:27:06 +02:00
Aloshi d781cebfa1 Remove debug messages 2013-07-03 03:23:18 -05:00
Aloshi 56dffeed8c Fixed memory leak in ImageIO.cpp 2013-07-03 03:17:34 -05:00
Aloshi 6b373924d2 Moved Fonts to be Resources. 
Moved Renderer::drawText stuff to the Font class.
Fonts are now used as std::shared_ptrs.
 2013-07-03 02:54:55 -05:00
Aloshi fe8c592623 Merge branch 'master' into unstable 
Conflicts:
	src/components/ImageComponent.h
 2013-07-03 01:30:44 -05:00
Aloshi 341aa766d8 Use path.generic_string() for game paths. 
Should now only use forward slashes, regardless of platform.
 2013-07-02 22:48:03 -05:00
Aloshi 04946d9fed Remove red test background on ScrollableContainer 2013-07-02 22:25:48 -05:00
Aloshi d616b4a202 Merge remote-tracking branch 'horstbaerbel/master' 
Conflicts:
	src/components/GuiGameList.cpp
 2013-07-02 22:24:43 -05:00
Aloshi ed384e057b Move scrolling out of TextComponent and into a generic 
ScrollableContainer.
 2013-07-02 20:01:58 -05:00
Bim acc22739b0 Merge remote-tracking branch 'upstream/master' 2013-07-03 02:12:49 +02:00
Bim 45ed6ae4da Add size set function to GuiComponent 
Similar to #92...
 2013-07-03 01:48:39 +02:00
Aloshi df78b5352d Changed AnimationComponent to use GuiComponent instead of ImageComponent. 
Possible now that the opacity logic has been moved to GuiComponent.
 2013-07-02 18:13:55 -05:00
Bim ac51656527 Read/Write sort order to settings 
Not written to disk atm.
 2013-07-02 23:14:33 +02:00
Bim ded54a6884 Merge 94e32f198b from unstable branch top master 
Had to hand-merge GuiGameList.cpp again :/
 2013-07-02 22:49:53 +02:00
Bim f72e80b629 Merge remote-tracking branch 'upstream/master' 
had to hand-merge GuiGameList.cpp
 2013-07-02 21:52:02 +02:00
Sir_Leon be86423712 Merge branch 'master' of https://github.com/leandromacrini/EmulationStation 2013-07-02 17:01:28 +02:00
Sir_Leon b4e554153a Moved Opacity logic to GuiComponent 
Moved Opacity logic from ImageComponent to GuiComponent so any extender
of GuiComponent che implement its opacity logic.

Implemented Opacity logic for TextComponent (now text can have fade
animation)
 2013-07-02 16:51:33 +02:00
Aloshi 0a6196dd9f Refactored Font class to use a TextCache for vertex data. 
The TextComponent class should start using it soon.
 2013-07-02 02:53:23 -05:00
Aloshi e785a2dfe0 You can now mix and match game list detail levels. 
Basically, only games that have a gamelist.xml will use the detailed view.
 2013-07-02 02:04:52 -05:00
Aloshi ec7ad28fdc Finally added scrolling description text. :) 2013-07-02 00:57:31 -05:00
Bim 94e32f198b Make sort order changeable via fast-select menu 
Use the left/right keys to switch it.
 2013-06-30 19:24:09 +02:00
Bim b329a5e1a0 Merge remote-tracking branch 'upstream/master' 2013-06-30 18:00:16 +02:00
Aloshi 3971fdc674 Fix last entry not showing (issue #90) 2013-06-29 20:57:14 -05:00
Aloshi c18877fdf1 Merge branch 'master' into unstable 2013-06-29 20:44:54 -05:00
Aloshi f4e2a14685 Temporarily disable polling while configuring inputs. 
Polling is disabled once the first device is chosen, and resumed once the
last device is configured.
 2013-06-29 20:43:13 -05:00
Aloshi 1dfb45e133 Print all Log messages to cout with --debug set. 
Added startPolling and stopPolling to InputManager.
 2013-06-29 20:37:18 -05:00
Aloshi 20d08587f2 Merge commit '171ca9a' from HorstBaerbel fork 2013-06-29 07:35:33 -05:00
Aloshi d986d739b2 Revert "Disable input device polling code to resolve freeze after ~45 minutes." 
This reverts commit 4a1206aee2.
 2013-06-29 07:30:32 -05:00
Bim Overbohm a60fe463d4 Support sorting of game list via input 
You can now map the functions "sortordernext" and "sortorderprevious" to
inputs (in es_input.cfg) and toggle the game list sort order with them.
The order is: "file name, ascending" (default), "file name, descending",
"rating ascending", "rating descending", "user rating ascending", "user
rating descending", "time played ascending", "times played descending",
"last played time ascending", "last played time descending".
 2013-06-28 19:44:28 +02:00
Bim Overbohm c61a470694 Add user rating and last time played to game data 
That should be about it...
 2013-06-28 17:25:18 +02:00
Bim Overbohm d99134763f Convert rating to float. Fix reading of timesPlayed. 
http://thegamesdb.net API seems to use a float. Fix a but where the
times played was read into the rating member.
 2013-06-28 16:13:57 +02:00
Bim Overbohm 556b9fa3fe Add functions for writing data to gamelist.xml 
Also add a "rating" and "timePlayed" variable to GameData. Some cleanup
in GameData and FolderData. Added sorting functions for rating and
timesPlayed to FolderData. Testing and UI support still tbd.
 2013-06-28 14:54:14 +02:00
Bim Overbohm 171ca9a657 Slightly better color array function 
Converting only once should be faster.
 2013-06-27 12:31:16 +02:00
Bim Overbohm b187f05a16 Fix font rendering for fonts with horizontal bearing 2013-06-27 12:30:04 +02:00
Bim Overbohm 887a1e00f8 Fix ES freezing without input 
And also hook up SDL joystick reinit when device removal or insertion is
detected.
 2013-06-27 10:26:56 +02:00
Aloshi 4a1206aee2 Disable input device polling code to resolve freeze after ~45 minutes. 
See issue #87.
 2013-06-26 23:25:58 -05:00
Aloshi 441e0f660c Merge branch 'master' into unstable 2013-06-26 20:33:18 -05:00
Aloshi 6f9ea15696 Fixed GuiGameList screenshot crash. For real, this time, probably. 2013-06-26 20:32:51 -05:00
Bim Overbohm e809414558 Merge remote-tracking branch 'upstream/master' 2013-06-24 11:57:19 +02:00
Aloshi 85f3ebf152 Fixed GuiGameList crashing on non-detailed view. 2013-06-21 16:54:41 -05:00
Aloshi 90af5d47ab Created the ResourceManager, Resource, and TextureResource classes. 
The ResourceManager provides a unified interface for accessing resource
data, embedded or from the filesystem, with
initialization/deinitialization handled automatically behind the scenes.
It also keeps from creating duplicate resources (e.g. when two
ImageComponents use the same image file).
Audio still needs to be moved over to it.
 2013-06-21 11:49:29 -05:00
Aloshi ae50cc82ad Updated version strings. 2013-06-20 14:08:33 -05:00
Bim Overbohm 47ddffb6c3 Another stab at correct SDL audio handling 
Fully de-initialize SDL audio in AudioManager::deinit().
 2013-06-20 16:14:10 +02:00
Aloshi 5619674c55 Work-around for no front buffer access on GLES. 
Buffer swap now occurs after update but before render.
 2013-06-19 19:56:45 -05:00
Aloshi 56569e5425 Made Settings Getter/Setter macro more g++-friendly. 2013-06-19 18:31:59 -05:00
Aloshi f651ea401c Removed volume from GuiInputConfig since it's in GuiSettingsMenu now. 2013-06-19 16:07:12 -05:00
Aloshi 62529029d7 Hooked up GuiSettingsMenu. 
Settings now save/load from ~/.emulationstation/es_settings.cfg.
 2013-06-19 16:02:42 -05:00
Aloshi 1534cec865 Added ComponentListComponent for laying out elements in a grid and 
navigating through them.
Added SliderComponent for selecting from a range of values.
Added SwitchComponent for selecting an "ON" or "OFF" value.
 2013-06-18 20:12:30 -05:00
Aloshi e8465baaba Moved externs for command-line args into a Settings singleton. 2013-06-17 14:01:03 -05:00
Aloshi 19eb1c412f Merge remote-tracking branch 'origin/unstable' into unstable 2013-06-16 16:24:17 -05:00
Aloshi da6ae9ac10 Initial screen transition when switching systems. 2013-06-16 16:23:04 -05:00
Aloshi 1b71abd44c Fixed marquee effect staying on when changing systems. 2013-06-15 13:06:52 -05:00
Aloshi 861297ae25 Added initial TextComponent. 
Reworked GuiGameList to use a TextComponent for description.
Changed set/clearClipRect to push/popClipRect.
Fixed Y coordinate in the clip rect functions.
Sorta fixed AnimationComponent being totally out of whack with VSync off.
 2013-06-14 10:48:13 -05:00
Aloshi bf84945010 Fixed XMLReader system path processing. 
getHomePath() now uses forward slash as a path separator on all platforms.
 2013-06-14 10:16:16 -05:00
Aloshi aec15ba0a1 Refactored Font to use a Vertex struct and Vector2. 
Fixed InputConfig error messages dumping to console and not logging.
Fixed skipped inputs being saved.
 2013-06-14 07:34:12 -05:00
Aloshi 023bc44abd Fixed a warning. 2013-06-14 06:26:04 -05:00
Aloshi b3fd961986 Merge remote-tracking branch 'horstbaerbel/master' into unstable 2013-06-14 06:22:17 -05:00
Bim Overbohm 8436c16426 Fix font rendering for big font sizes 
This should fix #81. If font creation fails because we're over max.
texture size, scale the glyphs down by some amount and then upscale the
text that is rendered. This gives a somewhat blurred image, but it works
for a lot more font sizes.
 2013-06-12 14:42:09 +02:00
Bim Overbohm 850147016f Improve audio and volume handling. 
Prevent a deadlock in AudioManager mixer callback when stopping sounds.
Detach and free mixer handle before closing it in
VolumeControl::deinit().
 2013-06-12 11:48:53 +02:00
Aloshi f577a72c23 Re-added input config fix that went missing... 2013-06-02 19:18:26 -05:00
Aloshi 7faf9fca53 Added Size and getSize() to GuiComponent. 
Added setClipRect and clearClipRect to Renderer.
TextListComponent finally has a marquee. :)
 2013-06-02 17:33:49 -05:00
Aloshi 826624481a Refactored ImageComponent to use Vector2. 2013-06-02 16:05:29 -05:00
Aloshi 24512c0c9f Component rendering now uses OpenGL translation. 
You don't need to take into account offset when rendering anymore.
 2013-06-02 14:34:50 -05:00
Aloshi 1cef2f5433 Write PROGRAM_VERSION_STRING at start of log. 2013-06-02 11:17:13 -05:00
Aloshi 628b0b6958 Put ComponentContainer directly in GuiComponent. 
Necessary for parenting to allow getOffset(), etc.
 2013-06-02 11:11:29 -05:00
Aloshi 424fcb0329 Basic GuiComponent refactor complete. 2013-06-02 10:08:32 -05:00
Aloshi 4d31aac85e Added Vector2 class. 2013-06-01 16:48:45 -05:00
Bim Overbohm c8bf0cf652 Better frame rate / time display 
Calculate and update every 500ms which makes it much more readable
 2013-05-29 20:22:02 +02:00
Bim Overbohm cfee178f2f Swap SDL color masks for icon 
So at least colors in the icon are displayed correctly
 2013-05-29 19:50:41 +02:00
Bim Overbohm fa6fdd7cce Convert image data only when necessary 
Convert images only when they're not already 32bit
 2013-05-29 19:49:28 +02:00
Aloshi 80e33849b5 Fixed a few crashes, better support for higan 
Fixed AudioManager/InputManager unsigned vs signed comparison warnings.
Fixed a FolderData sorting crash (I can't believe nobody's reported
this).
Fixed a GuiTheme crash for empty paths.
Added the %ROM_RAW% tag, for the unescaped ROM name - useful for higan
on windows.
SystemData will now add folders that end in EXTENSION as GameDatas, and
not recurse through them.  Also useful for higan.
 2013-05-27 12:13:38 -05:00
Bim Overbohm 6d499d4e3a Improve singleton implementation 
Still not thread-safe, but a bit better now. Should be made thread-safe
and maybe get converted to a template, if possible.
 2013-05-27 12:38:39 +02:00
Bim Overbohm e51dd35166 Fix volume control on Raspian. Correct some log messages 
Main/Master volume mixer is called "PCM" on Raspian instead of "Master".
 2013-05-27 09:44:54 +02:00
Bim Overbohm 01d5f1e085 Hide and unhide mouse cursor via SDL on startup 
This can also be made permanent by setting the environment variable
SDL_NOMOUSE=1 or 0, e.g. in $home/.bashrc
 2013-05-24 15:08:53 +02:00
Bim Overbohm 762952e7ea Poll joystick / HID devices without SDL on Windows / Linux 
Get a list of joysticks / HID devices from the system (scan
"/dev/input/js*" on Linux / use GetRawInputDeviceInfo() on Windows) and
poll again every 5s via a SDL timer. If the list changes SDL can be
re-inited. Atm only a log message is written.
 2013-05-24 13:44:40 +02:00
Bim Overbohm 970aa78cda Make master volume controllable via input 
Standard mapping is +/- keys. Setting is written to es_input.cfg.
 2013-05-23 11:43:50 +02:00
Bim Overbohm c989aae1c3 Remove whitespaces from system config lines 
to fix errors with files that have different line endings than the
system. Output a line number when something is wrong. This should be
done wherever reading from text files probably.
 2013-05-22 19:13:55 +02:00
Bim Overbohm edc26aa4e1 Add Volume control in Windows and Linux 
Add volume control int Windows through the mixer API (until XP) and the
EndpointVolume API (Vista and above). Add volume control in Linux
through ALSA.
Convert AudioManager to use shared_ptrs.
 2013-05-22 19:11:10 +02:00
Aloshi 12b4b12103 Added comment to src/ImageIO.h 2013-05-22 11:30:14 -05:00
Bim Overbohm a1cb5bdda1 Fix sounds not playing after launching a game 
Correctly re-initialize SDL_Audio after launching a game.
 2013-05-21 10:40:01 +02:00
Aloshi eaf157a330 Merge branch 'master' into unstable 2013-05-20 11:51:50 -05:00
Aloshi f3229f111c Fix for audio not reinitializing on restart. 2013-05-20 10:57:04 -05:00
Aloshi 79b7ab10b1 Merge https://github.com/HorstBaerbel/EmulationStation into unstable 
Conflicts:
	src/platform.cpp
 2013-05-17 10:05:05 -05:00
Bim Overbohm 86f68f29f9 Revert "Improve CMake script for Windows builds" 
This reverts commit e92a68fb46.
 2013-05-17 11:55:50 +02:00