Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Intro tweaks and cleanup #2649

Merged
merged 5 commits into from Jan 15, 2014
Merged

Intro tweaks and cleanup #2649

merged 5 commits into from Jan 15, 2014

Conversation

robn
Copy link
Member

@robn robn commented Jan 14, 2014

Intro doesn't get much love. Today it does :)

  • Don't make direct GL calls
  • Use a larger viewport to avoid clipping
  • Don't spin vertically, its kind of nauseating
  • Randomise skin and pattern for each ship display. No two ships the same, guaranteed!†

† Not a guarantee

@robn
Copy link
Member Author

robn commented Jan 14, 2014

Github is having a braino. Its the last four commits. The rest are on master already.

@fluffyfreak
Copy link
Contributor

Code all looks good to me :)

@walterar
Copy link
Contributor

User test: pass 👍

@laarmen
Copy link
Contributor

laarmen commented Jan 14, 2014

Do not merge yet, I have a bug. I still have to check whether it was there beforehand or a regression, but basically the first ship stays far away until a few milliseconds before it is supposed to disappear, at which point it jumps out in front of me, and then goes away as it is supposed to. The following ships behave normally.

@fluffyfreak
Copy link
Contributor

@laarmen I think that was already there, if you got a stall or hitch in the framerate then it would skip and get stuck with a ship in the wrong position.

@laarmen
Copy link
Contributor

laarmen commented Jan 14, 2014

OK, i'll merge later tonight then.
Le 14 janv. 2014 20:21, "Andrew Copland" notifications@github.com a écrit
:

@laarmen https://github.com/laarmen I think that was already there, if
you got a stall or hitch in the framerate then it would skip and get stuck
with a ship in the wrong position.


Reply to this email directly or view it on GitHubhttps://github.com//pull/2649#issuecomment-32297717
.

@robn
Copy link
Member Author

robn commented Jan 14, 2014

Yeah, that bug was there but I'd forgotten it, and I never quite understood what it was anyway. Thatnks @fluffyfreak, that should be easy to fix. But another time, got different stuff to do today.

@laarmen thanks :)

@fluffyfreak
Copy link
Contributor

Yeah I kept meaning to look into it, but y'know what it's like! :)

@robn
Copy link
Member Author

robn commented Jan 14, 2014

Rebased to current master, which seems to have de-confused Github.

More importantly, I think I fixed the bug. Instead of having discrete state change points, it now determines the right place in the animation each frame and does the right thing.

@fluffyfreak
Copy link
Contributor

I've got to learn to rebase, every time I've tried to use it on windows I just get constant conflicts. Even on a clean branch! :/

Anyway, that aside the code changes to fix the intro looks good.

@laarmen laarmen merged commit ebcfe3d into pioneerspacesim:master Jan 15, 2014
@robn robn deleted the intro-cleanup branch January 15, 2014 00:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants