lp:~glmark2-dev/glmark2/jellyfish

Created by Jesse Barker on 2012-07-03 and last modified on 2012-07-09
Get this branch:
bzr branch lp:~glmark2-dev/glmark2/jellyfish
Members of glmark2 developers can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
glmark2 developers
Project:
glmark2
Status:
Merged

Recent revisions

243. By Jesse Barker on 2012-07-09

Android: Revert unintentional removal of default properties file.

242. By Jesse Barker on 2012-07-09

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 on 2012-07-05

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 on 2012-07-05

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 on 2012-07-05

SceneJellyfish: Update time initialization to correct initial rotation and vertex
animation parameters.

238. By Jesse Barker on 2012-07-03

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).

237. By Jesse Barker on 2012-07-03

SceneJellyfish: Small changes for Android build.

236. By Jesse Barker on 2012-07-03

Re-order default benchmarks according to convention, now that debugging is done.

235. By Jesse Barker on 2012-07-03

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.

234. By Jesse Barker on 2012-07-03

SceneJellyfish: Simplify vertex animation computation.

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
This branch contains Public information 
Everyone can see this information.