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

Added support for sending additional data in the ParticleEffect packet #1951

Merged
merged 1 commit into from May 7, 2015

Conversation

Projects
None yet
2 participants
@worktycho
Member

worktycho commented May 6, 2015

Also the start of my refactor to move Broadcasts out of cWorld.

tycho
Added support for additional data in the ParticleEffect Packet
Also started refactoring how broadcasts are handled
Show outdated Hide outdated src/Broadcaster.cpp
Show outdated Hide outdated src/Broadcaster.cpp
Show outdated Hide outdated src/Broadcaster.cpp
Show outdated Hide outdated src/ChunkMap.cpp
Show outdated Hide outdated src/ChunkMap.h
void BroadcastParticleEffect(const AString & a_ParticleName, const Vector3f a_Src, const Vector3f a_Offset, float a_ParticleData, int a_ParticleAmount, cClientHandle * a_Exclude = nullptr);
void BroadcastParticleEffect(const AString & a_ParticleName, const Vector3f a_Src, const Vector3f a_Offset, float a_ParticleData, int a_ParticleAmount, std::array<int, 2> a_Data, cClientHandle * a_Exclude = nullptr);

This comment has been minimized.

@madmaxoft

madmaxoft May 7, 2015

Member

Is it wise, passing the vectors by-value?

@madmaxoft

madmaxoft May 7, 2015

Member

Is it wise, passing the vectors by-value?

This comment has been minimized.

@worktycho

worktycho May 7, 2015

Member

Well, the previous api passed the coordinates as separate parameters which were just as large overall.
If you find any performance evidence though I'll change it.

@worktycho

worktycho May 7, 2015

Member

Well, the previous api passed the coordinates as separate parameters which were just as large overall.
If you find any performance evidence though I'll change it.

This comment has been minimized.

@madmaxoft

madmaxoft May 7, 2015

Member

True, that. It's most likely faster to copy 3 floats than to access them later via an indirection.

@madmaxoft

madmaxoft May 7, 2015

Member

True, that. It's most likely faster to copy 3 floats than to access them later via an indirection.

@worktycho

This comment has been minimized.

Show comment
Hide comment
@worktycho

worktycho May 7, 2015

Member

I've fixed the style issues.

Member

worktycho commented May 7, 2015

I've fixed the style issues.

@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft May 7, 2015

Member

Not yet, but close.

I like these changes, the cBroadcaster is a nice idea.

When you get this working, could you squash it all into a single commit?

Member

madmaxoft commented May 7, 2015

Not yet, but close.

I like these changes, the cBroadcaster is a nice idea.

When you get this working, could you squash it all into a single commit?

@worktycho

This comment has been minimized.

Show comment
Hide comment
@worktycho

worktycho May 7, 2015

Member

Those should be fixed now. I'll squash if CI passes.

Member

worktycho commented May 7, 2015

Those should be fixed now. I'll squash if CI passes.

@worktycho

This comment has been minimized.

Show comment
Hide comment
@worktycho

worktycho May 7, 2015

Member

Squashed.

Member

worktycho commented May 7, 2015

Squashed.

madmaxoft added a commit that referenced this pull request May 7, 2015

Merge pull request #1951 from mc-server/BroadcastRefactor
Added support for sending additional data in the ParticleEffect packet

@madmaxoft madmaxoft merged commit 4888f67 into master May 7, 2015

4 checks passed

continuous-integration/appveyor AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
coverage/coveralls Coverage remained the same at 0.0%
Details
@madmaxoft

This comment has been minimized.

Show comment
Hide comment
@madmaxoft

madmaxoft May 7, 2015

Member

You might want to link the "email address" you use for commits to your account on GitHub

Member

madmaxoft commented May 7, 2015

You might want to link the "email address" you use for commits to your account on GitHub

@tigerw tigerw deleted the BroadcastRefactor branch May 9, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment