search

pokeparadox / PenjinTwo

A Game Engine framework, written in C++ with intent to be portable.
8 stars 2 forks source link

First try at P2 #1

Closed foxblock closed 13 years ago

foxblock commented 13 years ago

Hey there, I made the following experimental changes, please check them out and review them: Added SimpleDirection from Penjin1 Updated CollisionRegion to latest code using SimpleDirection Made Encryption.h compile Made Penjin.h compile

Also here is kind of a log of the errors I ran into when I tried to compile PenjinTwo (without a proper project attached to it, so did not link anything, just tried to compile the framework files): ColourHSL - no Penjin namespace, using old object definitions ColourHSV - see above Encryption - see above Game2D - requiring StateTitle.h Penjin - missing include headers Text - broken beyond repair, not using Penjin namespace, using not-available Glyph system TextFile - missing include PenjinFileObject mmuhack - needs some ifdefs to only compile for GP2X targets, so adding the whole Penjin source folder is safe You probably are aware of some of those, but there they are anyway. Also something that really bothered me with Penjin1 was the fact that I could not simply include the whole framework directory in my project, because some parts would not compile when others were present or specific requirements were met. With PenjinTwo that seems to be better, but muhhack for example still is a problem. It also might be worth discussing a PENJIN_2D and PENJIN_3D compile "flag" eventually to only make it compile relevant files.

Have a good week pal :)

pokeparadox commented 13 years ago

A lot of the above errors are simply files that have not been properly merged into the PenjinTwo tree yet and not currently in use in current PenjinTwo compatible projects. About the #ifdefs to help with easier compiling, sure it's something we need to work on. I'm not sure if we will actually need Penjin.h, at least currently it's not used.

foxblock commented 13 years ago

Okay sounds fair, but imo if those files are not properly merged yet they should not be in the repo in the first place :P or at least be marked as "deprecated" or something like that...

Thanks for the pull, hope it does not break too much :P

pokeparadox commented 13 years ago

Hey hey, now don't get on at me, I am only human and those files slipped through the net! That being said some of these files will be reviewed in due course. Also I've merged your changes into master, but I can't seem to merge them into my local copy... I'm 1 day newer than yourself to GIT so any ideas? It's looking like I'll just have to checkout a fresh working copy.

On 6 June 2011 18:03, foxblock < reply@reply.github.com>wrote:

Okay sounds fair, but imo if those files are not properly merged yet they should not be in the repo in the first place :P or at least be marked as "deprecated" or something like that...

Thanks for the pull, hope it does not break too much :P

Reply to this email directly or view it on GitHub: https://github.com/pokeparadox/PenjinTwo/pull/1#issuecomment-1312257

Kevin Winfield-Pantoja, Pirate Games - pirategames.co.uk

foxblock commented 13 years ago

I was just trying to express my view on that, not to attack you personally :)

To merge you usually do the following ( I don't have the proper commands at hand though I do everything with a GUI) 1) Pull my changes/branch and create a new local branch for it 2) Checkout you local master branch (or any branch you want to merge the changes into) 3) Make sure you have committed all changes in that branch 4) Merge the local "copy" branch of my changes with your master branch 5) Push the master branch 6) ??? 7) PROFIT!

At least that is how I do it ;)

EDIT: Well that seems overly complicated, actually I just select "pull", "pokeparadox/master" and merge it into my local branch, which is all done by one press of a button, dunno if that actually does the steps above or whether that is just the functionality of "pull"

foxblock commented 13 years ago

But it seems to me you already pushed another change so everything appears to be fine :)

foxblock commented 13 years ago

Thanks for the update :)

For the record (not an attack or anything, just so we got ourselves a list):

The reason I list the last is the one I mentioned earlier: It would be really nice to not have to worry what files of Penjin to add to a project, but to just "have it work"(tm), because that process was a major PITA with version 1 ;) You are on a good way with that and as I said, this is just a list of stuff to-do, not a list of stuff I want you to fix today :P

pokeparadox commented 13 years ago

OK buddy, no worries. I didn't really take it personally last time! :D

Btw I'm not entirely sure what you mean with the Vector error? The different Colour classes need more work in general, I didn't get around to finishing the work that would make them usable.... but yeah.

On 8 June 2011 05:09, foxblock < reply@reply.github.com>wrote:

Thanks for the update :)

For the record (not an attack or anything, just so we got ourselves a list):

  • ColourHSV and ColourHSL missng PenjinTwo conversion
  • muhhack still needs wrapping in ifdefs to only compile for appropriate platforms
  • Vector classes produce compile errors when added to CB project directly (as trying to compile a template class without specialisation does not work
    • not sure how to work around this)

The reason I list the last is the one I mentioned earlier: It would be really nice to not have to worry what files of Penjin to add to a project, but to just "have it work"(tm), because that process was a major PITA with version 1 ;) You are on a good way with that and as I said, this is just a list of stuff to-do, not a list of stuff I want you to fix today :P

Reply to this email directly or view it on GitHub: https://github.com/pokeparadox/PenjinTwo/pull/1#issuecomment-1325469

Kevin Winfield-Pantoja, Pirate Games - pirategames.co.uk