Commit Graph

33 Commits

Author SHA1 Message Date
Ryan Jacobs
55a30673c4 Remove unnecessary pointer checks.
There are *no* more spacing issues. I used tabs exclusively.
Also, I made changes off of the develop branch.

Here's the Ruby regex that I used:
text.gsub!(/(( |\t)*)if ?\((.*)\) ?{?\n?( |\t)*(free ?\(|delete |delete\[\] )(.*)\)?;/, "\\1\\5\\6;")
2015-02-14 22:13:26 -08:00
jacksonmj
236ff08da9 Fix some problems noted in http://www.viva64.com/en/b/0298/
I've left some of the less important items, like SearchView.cpp "'then' statement is equivalent to the 'else' statement", and RequestBroker::Request::~Request, because I don't feel like spending a few days entirely rewriting those files at the moment (which is what I'd end up doing if I started fixing minor problems and refactoring...)

GameSave::readOPS - not changed. At some point we may have to move to a larger type for element IDs (probably two or four bytes), but PT_NUM isn't likely to be raised to the maximum value of that type immediately, so this check will be needed then. There should be an elements[partsData[i]].Enabled check in there too, but it might be a bit difficult - I'm not sure how to access a Simulation object from GameSave::readOPS...

Notes on changes:

Graphics::textsize, Element_FRZW::Element_FRZW - typos

Button::Draw - the extra case was originally used to invert the icon (draw it in black instead of in white) when the button was clicked. However, the icon colour is now automatically set depending on the background colour. (Note similar conditions "if(Enabled) { if(isButtonDown || (isTogglable && toggle)) " near the start of the function - same logic but in a different place, setting icon colour indirectly).

Simulation::transform_save - unused redundant function, everything uses GameSave::Transform which does much the same thing.

PreviewView::NotifySaveChanged - should be height==YRES/2, it's checking whether the preview image is the correct size, and resizing it if it isn't.

Element_FWRK::update - no idea why that line was there, even though it was my commit that originally added it...
2014-12-25 17:09:35 +00:00
mniip
fdfaa3a29b add defines for window resolution
--amend
2013-12-29 20:12:50 +04:00
Simon Robertshaw
9abe51526c Move all GUI source files into gui/ 2013-03-22 14:14:17 +00:00
Simon Robertshaw
73b6ff4efb Use VideoBuffer in place of thumbnail 2013-03-15 12:59:55 +00:00
jacob1
037618e6f8 remove auto generated comments from all files, fix some missing tabs, remove unused variables from config.h 2013-03-06 12:05:59 -05:00
jacob1
5c59b9d6cb don't render fire on stamps (reduces lag) 2012-10-05 15:49:54 +01:00
Simon Robertshaw
3b2f4d59fc Better fire rendering for saves 2012-09-14 23:53:58 +01:00
Simon Robertshaw
92f3ad5814 Black decorations only in thumbnails 2012-08-28 15:53:07 +01:00
Simon Robertshaw
0ca680f4c8 Enable decorations in renderer for local save items, disable for server save previews. 2012-08-27 13:32:17 +01:00
Simon Robertshaw
ebc4116675 Disable decorations when rendering saves 2012-08-26 16:37:17 +01:00
Simon Robertshaw
074dcd0b42 Precompile some headers. Fix sconscript to prevent recompiling everything 2012-08-13 15:43:57 +01:00
Simon Robertshaw
8ca27520a4 Use forward declarations more to avoid excessive includes 2012-08-12 22:32:57 +01:00
Simon Robertshaw
aa774771a0 Collapse gamesave to save space in memory 2012-07-28 02:23:21 +01:00
Simon Robertshaw
5befe5c25f Local file browser + some more interesting things like Progress bar UI component 2012-07-27 20:06:17 +01:00
Simon Robertshaw
2b4ec99894 Use two functions for renderer drawing instead of several, fix alignment with Zoom Window border 2012-07-19 16:37:56 +01:00
Simon Robertshaw
adc9cc0816 Move graphics into seperate folder 2012-07-06 16:06:26 +01:00
Simon Robertshaw
694a6ed4f2 Ammend to previous commit - the issue was not with smaller saves, but the accumulation of rendered particles on the framebuffer - fixed by clearing the fbo and pbo before rendering 2012-06-25 22:34:04 +01:00
Simon Robertshaw
2ffb45581f SaveRenderer working on OpenGL - doesn't seem to work with small saves though 2012-06-25 22:26:53 +01:00
Simon Robertshaw
dacb774ae0 Resizable window when using OpenGL interface 2012-06-25 16:10:40 +01:00
Simon Robertshaw
550f6e28e0 Stage 1 of update process completed 2012-06-21 15:49:32 +01:00
Bryan Hoyle
3b29a74767 fixes to code and a option for opengl building for release 2012-06-20 15:05:25 -04:00
Bryan Hoyle
c775126272 Merging 2012-06-20 14:45:06 -04:00
Simon Robertshaw
09758b9152 SaveRenderer returns a placeholder thumbnail in case of OpenGL 2012-06-20 19:43:03 +01:00
Bryan Hoyle
e5e638448c remove some debugging 2012-06-20 14:42:42 -04:00
Bryan Hoyle
b35255b722 Renders an X in place of save icons, atm. 2012-06-20 14:25:41 -04:00
Bryan Hoyle
c9f837f21d Opengl can open saves now, just need to get it to render accurately later 2012-06-20 14:23:22 -04:00
Simon Robertshaw
6f814528fc Correct save reloading, add Vac and NGrav tools 2012-06-12 15:37:46 +01:00
Simon Robertshaw
0ee1e1875d Load save data when showing the save preview 2012-06-08 22:04:14 +01:00
Simon Robertshaw
2e48fc6115 'No Image' icon when save rendering fails 2012-06-06 01:54:27 +01:00
Simon Robertshaw
8fae7dbade Saving and loading at position, yuse exceptions for parsing saves 2012-06-06 01:46:13 +01:00
Simon Robertshaw
49dafbfd26 Use a different method for decoding saves with uncompressed object in memory for stamps and clipboard, also allows for transformation (rotation), missing failure states and code for loading it into a Simulation 2012-06-05 20:08:35 +01:00
Simon Robertshaw
838a612026 Use a single instance of a background simulation for thumbnail rendering 2012-04-03 17:08:56 +01:00