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

Redpawfx #21

Closed
wants to merge 470 commits into from
Closed

Redpawfx #21

wants to merge 470 commits into from

Conversation

redpawfx
Copy link
Contributor

Went diving into all the other forks to find as many formats as I could, and hand merged them all together. Fixed them up and updated them to work with the latest version from WDAS.
Now Partio Supports (Read/Write)
BGEO R/W
GEO R/W
BIN (realflow) R/W
MC (maya nCache) Read only
PDA R/W
PDB R/W
PDC R/W
PRT (krakatoa) R/W
PTC R/W
RIB Write only
PTS ( simple text Lidar format ) Read only

Additionally I continued updating and adding to partview GLUT controls and features adding to what crydalch added to also include the following features:

-MUCH faster point interaction with milions of points
-better color support (also toggle color on off with C/c)
-multi-frame viewer support with keyboard controls (left right arrow keys)
-point size control via keyboard controls (+/- keys)
-Maya like tumble controls with alt-key including mouse wheel support
-FOV control via Z/z keys
-Overlays to display point count , frame number and FOV

also started to investigate how to implement a loading feedback mechanism that eventually we'll be able to re-implement in whatever package partio is being used in.
Right now this can be seen only in the PTS loader.

Happy Holidays!

@aselle
Copy link
Contributor

aselle commented Dec 20, 2011

Wow! I will try to get to reviewing that patch very soon, but I may not get
to it until Thursday. I have to complete a few things at work, but I
probably will have time on my flight to Germany. But I definitely want to
merge it in very soon into main master!

-Andy

On Mon, Dec 19, 2011 at 5:04 PM, John C <
reply@reply.github.com

wrote:

Went diving into all the other forks to find as many formats as I could,
and hand merged them all together. Fixed them up and updated them to work
with the latest version from WDAS.
Now Partio Supports (Read/Write)
BGEO R/W
GEO R/W
BIN (realflow) R/W
MC (maya nCache) Read only
PDA R/W
PDB R/W
PDC R/W
PRT (krakatoa) R/W
PTC R/W
RIB Write only
PTS ( simple text Lidar format ) Read only

Additionally I continued updating and adding to partview GLUT controls
and features adding to what crydalch added to also include the
following features:

-MUCH faster point interaction with milions of points
-better color support (also toggle color on off with C/c)
-multi-frame viewer support with keyboard controls (left right arrow
keys)
-point size control via keyboard controls (+/- keys)
-Maya like tumble controls with alt-key including mouse wheel support
-FOV control via Z/z keys
-Overlays to display point count , frame number and FOV

also started to investigate how to implement a loading feedback
mechanism that eventually we'll be able to re-implement in whatever
package partio is being used in.
Right now this can be seen only in the PTS loader.

Happy Holidays!

You can merge this Pull Request by running:

git pull https://github.com/redpawfx/partio redpawfx

Or you can view, comment on it, or merge it online at:

#21

-- Commit Summary --

  • manually merged drakeguan fork into redpawfx
  • merged crydalch fork into redpawfx (partview with color/alpha support)
  • merge some of jinkuen fork into redpawfx (PDC support)
  • merged in K240 branch PRT I/O stuff to redpawfx
  • Merge commit redpawfx '84862664890b017acb4066c5dac1b0175abdddaa' into
    master
  • added bin file support from jinkuen fork (doesent work yet)
  • update to PRT file format exporter to not export 0 particle files as
    Krakatoa tends to choke on them
  • Modified headers and formats for several format additions from various
    forks, manually merged several branches together including latest from wdas
    with string attr parsing.
  • Merge commit master 'dfa805472b3a74eaeec585bca91a18f1d5c6e35d' into
    redpawfx
  • cleanup and .gitIgnore stuff
  • cleanup / .gitignore
  • massive upgrades to the partview glut viewer to support multiple
    frames, better navigation and fixes for color/alpha reading and a bunch
    of other settings with keypress events also added the PTS file format
    (all need cleanup)
  • continuing to add features to partview to make it a much more full
    featured particle viewer, added Maya alt+mouse control and key-debounce
    on all key inputs to make the keypress interaction more responsive and
    not buffer key-repeats
  • swapped around openGL calls a bit to massivly speed up high particle
    count clouds interaction rates.
  • updated formats partview and base particle files
  • added in basic loading progress function, we'll want to make this an
    overridable class member at some point and put it
  • quick comments on stuff

-- File Changes --

M .gitignore (18)
M CMakeLists.txt (4)
A Doxyfile (323)
A Makefile (380)
A src/doc/Doxyfile (1253)
A src/doc/Makefile (200)
A src/lib/Makefile (509)
M src/lib/Partio.h (28)
M src/lib/PartioAttribute.h (19)
M src/lib/core/KdTree.h (12)
M src/lib/core/Particle.cpp (31)
M src/lib/core/ParticleCaching.cpp (33)
M src/lib/core/ParticleHeaders.cpp (33)
M src/lib/core/ParticleHeaders.h (6)
M src/lib/core/ParticleSimple.cpp (49)
M src/lib/core/ParticleSimple.h (14)
M src/lib/core/ParticleSimpleInterleave.cpp (49)
M src/lib/core/ParticleSimpleInterleave.h (9)
M src/lib/io/BGEO.cpp (93)
A src/lib/io/BIN.cpp (500)
M src/lib/io/GEO.cpp (116)
A src/lib/io/MC.cpp (398)
M src/lib/io/PDA.cpp (84)
M src/lib/io/PDB.cpp (50)
A src/lib/io/PDC.cpp (175)
A src/lib/io/PRT.cpp (421)
M src/lib/io/PTC.cpp (87)
A src/lib/io/PTS.cpp (306)
M src/lib/io/ParticleIO.cpp (106)
R src/lib/io/PartioEndian.h (4)
A src/lib/io/RIB.cpp (152)
A src/lib/io/half2float.h (2048)
M src/lib/io/pdb.h (3)
M src/lib/io/readers.h (66)
M src/py/CMakeLists.txt (4)
A src/py/Makefile (203)
M src/py/partio.i (25)
M src/tests/CMakeLists.txt (12)
A src/tests/Makefile (401)
M src/tests/makecircle.cpp (13)
M src/tests/makeline.cpp (7)
A src/tests/teststr.cpp (83)
M src/tools/CMakeLists.txt (4)
A src/tools/Makefile (302)
A src/tools/partattr.cpp (64)
M src/tools/partinfo.cpp (11)
M src/tools/partview.cpp (732)
A src/tools/partview.h (111)

-- Patch Links --

https://github.com/wdas/partio/pull/21.patch
https://github.com/wdas/partio/pull/21.diff


Reply to this email directly or view it on GitHub:
#21

@redpawfx
Copy link
Contributor Author

Awesome!
I know everybody has their own code style and formatting style, so
let me know if there are any style issues you'd like fixed.
This is also my first venture into writing anything with GLUT, and I'm still learning
tons of c++ stuff, so if there's anything you'd like to give advice on, feel free.
I'll be lurking online but not at work thru the holidays. have a good one!

-johnc

@redpawfx redpawfx closed this Dec 20, 2011
@redpawfx redpawfx reopened this Dec 20, 2011
@redpawfx
Copy link
Contributor Author

redpawfx commented Jan 9, 2012

Hey Andy, Happy New year, let me know if you have any questions or
comments about the big pull request, have you had time to look at it yet?
I have a couple of other ideas about re-structuring the file IO stuff as
well, I'd like to run by you. if you can message me outside the pull
request, your "message" on github does not work.

talk to you soon
-johnc

On Mon, Dec 19, 2011 at 5:11 PM, aselle <
reply@reply.github.com

wrote:

Wow! I will try to get to reviewing that patch very soon, but I may not get
to it until Thursday. I have to complete a few things at work, but I
probably will have time on my flight to Germany. But I definitely want to
merge it in very soon into main master!

-Andy

On Mon, Dec 19, 2011 at 5:04 PM, John C <
reply@reply.github.com

wrote:

Went diving into all the other forks to find as many formats as I could,
and hand merged them all together. Fixed them up and updated them to
work
with the latest version from WDAS.
Now Partio Supports (Read/Write)
BGEO R/W
GEO R/W
BIN (realflow) R/W
MC (maya nCache) Read only
PDA R/W
PDB R/W
PDC R/W
PRT (krakatoa) R/W
PTC R/W
RIB Write only
PTS ( simple text Lidar format ) Read only

Additionally I continued updating and adding to partview GLUT controls
and features adding to what crydalch added to also include the
following features:

-MUCH faster point interaction with milions of points
-better color support (also toggle color on off with C/c)
-multi-frame viewer support with keyboard controls (left right arrow
keys)
-point size control via keyboard controls (+/- keys)
-Maya like tumble controls with alt-key including mouse wheel support
-FOV control via Z/z keys
-Overlays to display point count , frame number and FOV

also started to investigate how to implement a loading feedback
mechanism that eventually we'll be able to re-implement in whatever
package partio is being used in.
Right now this can be seen only in the PTS loader.

Happy Holidays!

You can merge this Pull Request by running:

git pull https://github.com/redpawfx/partio redpawfx

Or you can view, comment on it, or merge it online at:

#21

-- Commit Summary --

  • manually merged drakeguan fork into redpawfx
  • merged crydalch fork into redpawfx (partview with color/alpha support)
  • merge some of jinkuen fork into redpawfx (PDC support)
  • merged in K240 branch PRT I/O stuff to redpawfx
  • Merge commit redpawfx '84862664890b017acb4066c5dac1b0175abdddaa' into
    master
  • added bin file support from jinkuen fork (doesent work yet)
  • update to PRT file format exporter to not export 0 particle files as
    Krakatoa tends to choke on them
  • Modified headers and formats for several format additions from
    various
    forks, manually merged several branches together including latest from
    wdas
    with string attr parsing.
  • Merge commit master 'dfa805472b3a74eaeec585bca91a18f1d5c6e35d' into
    redpawfx
  • cleanup and .gitIgnore stuff
  • cleanup / .gitignore
  • massive upgrades to the partview glut viewer to support multiple
    frames, better navigation and fixes for color/alpha reading and a
    bunch
    of other settings with keypress events also added the PTS file format
    (all need cleanup)
  • continuing to add features to partview to make it a much more full
    featured particle viewer, added Maya alt+mouse control and key-debounce
    on all key inputs to make the keypress interaction more responsive
    and
    not buffer key-repeats
  • swapped around openGL calls a bit to massivly speed up high particle
    count clouds interaction rates.
  • updated formats partview and base particle files
  • added in basic loading progress function, we'll want to make this an
    overridable class member at some point and put it
  • quick comments on stuff

-- File Changes --

M .gitignore (18)
M CMakeLists.txt (4)
A Doxyfile (323)
A Makefile (380)
A src/doc/Doxyfile (1253)
A src/doc/Makefile (200)
A src/lib/Makefile (509)
M src/lib/Partio.h (28)
M src/lib/PartioAttribute.h (19)
M src/lib/core/KdTree.h (12)
M src/lib/core/Particle.cpp (31)
M src/lib/core/ParticleCaching.cpp (33)
M src/lib/core/ParticleHeaders.cpp (33)
M src/lib/core/ParticleHeaders.h (6)
M src/lib/core/ParticleSimple.cpp (49)
M src/lib/core/ParticleSimple.h (14)
M src/lib/core/ParticleSimpleInterleave.cpp (49)
M src/lib/core/ParticleSimpleInterleave.h (9)
M src/lib/io/BGEO.cpp (93)
A src/lib/io/BIN.cpp (500)
M src/lib/io/GEO.cpp (116)
A src/lib/io/MC.cpp (398)
M src/lib/io/PDA.cpp (84)
M src/lib/io/PDB.cpp (50)
A src/lib/io/PDC.cpp (175)
A src/lib/io/PRT.cpp (421)
M src/lib/io/PTC.cpp (87)
A src/lib/io/PTS.cpp (306)
M src/lib/io/ParticleIO.cpp (106)
R src/lib/io/PartioEndian.h (4)
A src/lib/io/RIB.cpp (152)
A src/lib/io/half2float.h (2048)
M src/lib/io/pdb.h (3)
M src/lib/io/readers.h (66)
M src/py/CMakeLists.txt (4)
A src/py/Makefile (203)
M src/py/partio.i (25)
M src/tests/CMakeLists.txt (12)
A src/tests/Makefile (401)
M src/tests/makecircle.cpp (13)
M src/tests/makeline.cpp (7)
A src/tests/teststr.cpp (83)
M src/tools/CMakeLists.txt (4)
A src/tools/Makefile (302)
A src/tools/partattr.cpp (64)
M src/tools/partinfo.cpp (11)
M src/tools/partview.cpp (732)
A src/tools/partview.h (111)

-- Patch Links --

https://github.com/wdas/partio/pull/21.patch
https://github.com/wdas/partio/pull/21.diff


Reply to this email directly or view it on GitHub:
#21


Reply to this email directly or view it on GitHub:
#21 (comment)

@aselle
Copy link
Contributor

aselle commented Jan 10, 2012

Hey.. I sent you an email with my current status on patch review... may be easier to work through standard email :)

…s around to handle all the attrs and not replicate too much code over and over for each attr.
…on subframes correctly and all attrs appear to work as they should for instancing rotation stuff.
added support for instancer  aim axis stuff
…e open GL

specifically for index draw text on particles
Conflicts:
	src/lib/core/KdTree.h
	src/lib/io/ParticleIO.cpp
…he tree with cmake, not quite there yet... the plugin compiles, but does not show up in houdini... but his makefile version of the compile will... I'm a newb at HDK...
Conflicts:
	contrib/partio4Houdini/src/ROP_partio.C
	contrib/partio4Houdini/src/partio_houdini.C
…here's still one spot where include path is hardcoded.. feel free to clean this up a bit further.
…roper build outputs for the houdini plugin and icons
sirpalee and others added 28 commits May 16, 2017 12:04
Also reorganizing structure and sharing code between multiple source files. internal issue #7
@davvid
Copy link
Member

davvid commented Apr 18, 2019

Just following up with this old merge request. Sorry we left this hanging for so long. I've been going through the PR queue and merging what I can, but a lot has changed in the tree since this was first submitted so it might be worth resubmitted a version rebased or merged against the latest master.

Hopefully the more recent changes related to win32 compatibility has helped out. I'd very much like to incorporate as much as we can so that you don't have to maintain a fork. I'm going to close this PR for now but please don't interpret that as meaning that we're not interested -- just that it might be simpler to open a new PR.

@davvid davvid closed this Apr 18, 2019
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