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

Particles 3d #2005

Merged
merged 3 commits into from Jun 22, 2014

Conversation

@lordjone
Copy link
Contributor

lordjone commented Jun 21, 2014

Let's hope it's the right one this time :)

inferno added 3 commits Jun 21, 2014
Conflicts:
	gdx/src/com/badlogic/gdx/math/Matrix4.java
Conflicts:
	gdx/src/com/badlogic/gdx/math/Matrix4.java
@MobiDevelop

This comment has been minimized.

Copy link
Member

MobiDevelop commented Jun 21, 2014

Just a couple notes initially while they are fresh in my mind:

  • Still need to make GWT compatible, I can do that after merge if needed.
  • Need to add the glsl files to the resources in build.xml so they get included.
@johnnyapol

This comment has been minimized.

Copy link
Member

johnnyapol commented Jun 21, 2014

I quickly skimmed through it, and I just have two things to add:

  • Is the PremultiplyAlpha test going to be included as a test? It wasn't added to gdx-tests
  • If the PremultiplyAlpha test is going to be included, the hardcoded file values will have to go because the environment will have to be replicated like yours.
@MobiDevelop

This comment has been minimized.

Copy link
Member

MobiDevelop commented Jun 21, 2014

I believe the PremultiplyAlpha test was only temporarily in the main repo... it has been removed so should be removed from here too.

@MobiDevelop

This comment has been minimized.

Copy link
Member

MobiDevelop commented Jun 21, 2014

I've got the changes made for GWT, do you want me to make a PR for you to merge before we merge this?

@lordjone

This comment has been minimized.

Copy link
Contributor Author

lordjone commented Jun 21, 2014

Good, maybe is better to wait until it's merged and then make a separated PR for it

@MobiDevelop

This comment has been minimized.

Copy link
Member

MobiDevelop commented Jun 21, 2014

Well, if you don't make any other changes I can just merge from my clone. We'll see if anyone else has any additional comments/changes.

@lordjone

This comment has been minimized.

Copy link
Contributor Author

lordjone commented Jun 21, 2014

I'm not working on it these days so it's k for me.
Let's see what the other think.

@nooone

This comment has been minimized.

Copy link
Contributor

nooone commented Jun 21, 2014

whispers: meeeeeerge! :D

@badlogic

This comment has been minimized.

Copy link
Member

badlogic commented Jun 22, 2014

Ya, merge if you fix up GWT. Would do a release after the merge.

@badlogic

This comment has been minimized.

Copy link
Member

badlogic commented Jun 22, 2014

Also, a wiki page would be nice :)

@lordjone

This comment has been minimized.

Copy link
Contributor Author

lordjone commented Jun 22, 2014

@badlogic GWT was fixed by @MobiDevelop , so you could merge and then apply the GWT fixes

@MobiDevelop MobiDevelop merged commit 795ef64 into libgdx:master Jun 22, 2014
@MobiDevelop

This comment has been minimized.

Copy link
Member

MobiDevelop commented Jun 22, 2014

@lordjone You are still on the hook for a wiki entry detailing usage.

@jrenner

This comment has been minimized.

Copy link
Member

jrenner commented Jun 25, 2014

@lordjone I made a basic page on the wiki to get started with:
https://github.com/libgdx/libgdx/wiki/3D-Particle-Effects

It's very basic and might have some errors, but it's a good start for those who want to try it out.

@lordjone

This comment has been minimized.

Copy link
Contributor Author

lordjone commented Jun 25, 2014

Thanks @jrenner :)
i think there is an error in step 4, particleSystem.update(); this is not required for rendering and should be called before any begin/draw/end sequence to update the effects

@jrenner

This comment has been minimized.

Copy link
Member

jrenner commented Jun 25, 2014

Fixed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.