lp:~glmark2-dev/glmark2/obj-update

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:glmark2/2011.11 at revision 260

Alexandros Frantzis: Approve on 2013-02-01

Diff: 730 lines (+296/-180)

8 files modified

src/model.cpp (+262/-168)
src/model.h (+17/-4)
src/scene-build.cpp (+2/-1)
src/scene-bump.cpp (+6/-3)
src/scene-refract.cpp (+2/-1)
src/scene-shading.cpp (+2/-1)
src/scene-shadow.cpp (+2/-1)
src/scene-texture.cpp (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

266. By Jesse Barker on 2013-01-30

Model: Should be the last pass. This handles fairly arbitrary .obj content, but
not actually arbitrary content. In particular, we support absolute indexed face
elements describing triangles. The other features available from this file
format are unlikely to work and may require significant reworking of the mesh
representation to accommodate them.

265. By Jesse Barker on 2013-01-29

Model: Update convert_to_mesh() (really append_object_to_mesh()) to support the
separate normal and texcoord attributes that can come from OBJ file format face
descriptions.

264. By Jesse Barker on 2013-01-29

Model: Add a little paranoia to calculate_normals() and calculate_texcoords()
by checking the "got" booleans before potentially overwriting/corrupting
existing values. Also, set the "got" booleans on the way out, so we know we
have values.

263. By Jesse Barker on 2013-01-29

Scene,Model: Update the scenes that rely on the Model to calculate normals for
the vertices to check that the normals aren't already there.

262. By Jesse Barker on 2013-01-29

Model: Make sure Model can actually track and represent all of the attribute and
face data that might come out of an OBJ format file (at least the stuff we
actually care about). This keeps 3ds support exactly as it was using the new
internals and integrates the OBJ code fully into Model. Still need to make the
mesh conversion code use the data (if it's present), and possibly tweak some of
the calling code (in scenes) check before calculating normals and texcoords.

261. By Jesse Barker on 2013-01-28

Model: First cut at parsing per-vertex texcoord and normal data, as well as
face descriptions for OBJ files. The OBJ file format allows for per-attribute
indices in the face description, so these must all be tracked separately (no
single index into all 3 arrays).

260. By Jesse Barker on 2013-01-28

Model: Add in state to reflect whether a model contains per-vertex normal data.
We already had this for texcoords, but some OBJ models will also have normals.

259. By Jesse Barker on 2012-12-21

SceneRefract: The GLSL [ES] built-in 'refract()' expects a ratio of refractive
indices, so make the back interface value a reciprocal of the front.

258. By Jesse Barker on 2012-12-18

Build,Doc: Update files for 2012.12 release.

257. By Jesse Barker on 2012-12-18

Merge of lp:~glmark2-dev/glmark2/canvas-drm-rebranch

Adds CanvasDRM, which uses GBM and KMS APIs to manage surfaces and modesetting,
respectively. Allows glmark2 to run on a console and take over the framebuffer
directly (no window/display manager).