lp:~glmark2-dev/glmark2/jellyfish
- Get this branch:
- bzr branch lp:~glmark2-dev/glmark2/jellyfish
Branch merges
- Jesse Barker: Needs Resubmitting
- Alexandros Frantzis: Needs Fixing
-
Diff: 25432 lines (+25269/-1) (has conflicts)12 files modifieddata/models/jellyfish.jobj (+24432/-0)
data/shaders/gradient.frag (+10/-0)
data/shaders/gradient.vert (+10/-0)
data/shaders/jellyfish.frag (+21/-0)
data/shaders/jellyfish.vert (+56/-0)
src/android.cpp (+4/-0)
src/default-benchmarks.h (+1/-0)
src/main.cpp (+4/-0)
src/model.cpp (+4/-1)
src/scene-jellyfish.cpp (+591/-0)
src/scene-jellyfish.h (+118/-0)
src/scene.h (+18/-0)
Related bugs
Related blueprints
Branch information
Recent revisions
- 242. By Jesse Barker
-
SceneJellyfish: Relocate core scene timing initialization so we don't measure
set up as part of the scene. This obviates the need for the time parameter
in the private initialization method. - 241. By Jesse Barker
-
Ensure file access for all model data goes through Util::get_
resource( ) or the
file will fail to open on Android. This was a problem both for the original
OBJ file format support as well as the recently added jellyfish "modified OBJ"
model. - 240. By Jesse Barker
-
SceneJellyfish: Clean up the arrangement of the files to more closely match the
naming scheme for the other scenes (rename the header "scene-jellyfish. h", and
move the private implementation into the public scene source). - 239. By Jesse Barker
-
SceneJellyfish: Update time initialization to correct initial rotation and vertex
animation parameters. - 238. By Jesse Barker
-
SceneJellyfish: Disable depth test when drawing the jellyfish. Not a problem for
OpenGL on the NVIDIA proprietary driver, but for OpenGL ES 2, seems to be (at
least for the Mesa software renderer). - 236. By Jesse Barker
-
Re-order default benchmarks according to convention, now that debugging is done.
- 235. By Jesse Barker
-
SceneJellyfish: Ensure that the wrap parameters for the caustic textures are set
to GL_REPEAT as the texcoord computation generates values well outside of the
(0.0, 1.0) interval.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:glmark2/2011.11