CCinemaPath should contain only simulation and additional math data, so it shouldn't draw itself. CCinemaManager already handles most of drawing operations.
Also added lines between a spline and a terrain.
Details
Details
- Reviewers
elexis - Commits
- rP19394: Move OpenGL CinemaPath rendering code to the CinemaManager, so that the…
- Trac Tickets
- #3871
- Open a map with cinema paths
- Toggle checkbox about the path drawing
- Check that all is drawn the same
Diff Detail
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline
Comment Actions
Build has FAILED
Link to build: http://jw:8080/job/phabricator/720/
See console output for more information: http://jw:8080/job/phabricator/720/console
Comment Actions
Build is green
Updating workspaces. Build (release)... Build (debug)... Running release tests... Running cxxtest tests (305 tests).................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (305 tests).................................................................................................................................................................................................................................................................................................................OK!
http://jw:8080/job/phabricator/721/ for more details.
Comment Actions
summary could have mentioned the distptr removal and that the intention is to move the openGL code to the other graphics file so that the remaining code can more easily be moved to the simulation.
Thanks for the patch!
| source/graphics/CinemaManager.cpp | ||
|---|---|---|
| 116 ↗ | (On Diff #1167) | Would be great to make those colors more modifyable, moving them to a member variable would improve. An XML file might be nice, but didn't see a good place where to add them. source/ doesn't have any XML files, public/art/ has no place for color settings. Also there are other hardcoded CColors which could be placed into the same file. |
| 120 ↗ | (On Diff #1167) | Continue not return |
| 127 ↗ | (On Diff #1167) | color argument indeed useful because selected / active paths could be rendered in a different color |
| 138 ↗ | (On Diff #1167) | "something" is a bit vague. "Implement GLES support" would be better |
| 141 ↗ | (On Diff #1167) | glEnable(GL_BLEND); was added to enable transparency, good change. |
| 151 ↗ | (On Diff #1167) | 2 spaces IMO |
| 156 ↗ | (On Diff #1167) | // Render height indicaor lines |
| 197 ↗ | (On Diff #1167) | Ok, was entirely moved besides the change of the current color. nodesColor -> nodeColor |
| 207 ↗ | (On Diff #1167) | range based loop |
| source/graphics/CinemaPath.cpp | ||
| 101 ↗ | (On Diff #1167) | (18:33:00) elexis: Vladislav: why no more DistModePtr? |
| source/graphics/CinemaManager.cpp | ||
|---|---|---|
| 203 ↗ | (On Diff #1167) | Perhaps the points could become larger and darker. |