• Log graph

Commits in qt-labs/qt3d:displaylist

• Tuesday July 20 2010

  • 07:51

    

    sarasmit committed d7745b8

    Merge branch 'master' into displaylist

  • 07:48

    

    Julian de Bhal committed a95574a

    Update QML/3d ShaderProgram to use QDeclarativePixmap. Update docs.

  • 07:47

    

    sarasmit committed 8909101

    Fixed a few broken examples.

  • 05:38

    

    sarasmit committed 89b0164

    All unit tests now pass.

• Monday July 19 2010

  • 09:48

    

    sarasmit committed f91e08e

    Another interim commit.

  • 04:24

    

    Julian de Bhal committed f6e81a5

    Temporarily disable ShaderProgramEffect image logic so it compiles.

  • 04:23

    

    Julian de Bhal committed 7de4fbe

    Update qml3d Effect to use new QDeclarativePixmap api

• Thursday July 15 2010

  • 06:57

    

    sarasmit committed 3c043e5

    Documentation fixed.

  • 05:19

    

    sarasmit committed ab4b03d

    Interim commit - actually compiles.

• Tuesday July 13 2010

  • 09:01

    

    sarasmit committed a198903

    Merge branch 'displaylist' of git@scm.dev.nokia.troll.no:research/qt3d into displaylist

  • 07:58

    

    sarasmit committed 3f19ca8

    Interim commit API refactoring.

  • 07:54

    

    sarasmit committed e0a9ce7

    Merge branch 'master' into displaylist

  • 07:53

    

    sarasmit committed 5c2c892

    Merge branch 'displaylist' of git@scm.dev.nokia.troll.no:research/qt3d into displaylist

• Thursday July 08 2010

  • 02:41

    

    rweather committed 7645ca1

    Workaround lack of GLintptr and GLsizeiptr on some systems.

• Wednesday July 07 2010

  • 08:37

    

    Julian de Bhal committed bace6d6

    minor shader refinement

  • 08:36

    

    Julian de Bhal committed e9512c8

    Fix lighting for shader programs

• Tuesday July 06 2010

  • 02:12

    

    Julian de Bhal committed aa65ec3

    Item3d: If a light is set on the painter, always unset it afterwards

• Monday July 05 2010

  • 04:42

    

    thoughthorizon committed ccbc9a2

    Merge branch 'master' of scm.dev.nokia.troll.no:research/qt3d

  • 04:41

    

    thoughthorizon committed 34136bc

    Changes to the 3ds loader & texture2d classes to properly support local files as qURLs. qUrl.path() is not the same as qUrl.toLocalFile() on Windows (TM) at least.

• Friday July 02 2010

  • 16:57

    

    trond committed 25f9082

    Compile with the new GL resource stuff in 4.8.

  • 07:54

    

    rweather committed 37d0ff5

    Merge branch 'master' of scm.dev.nokia.troll.no:research/qt3d

  • 07:53

    

    rweather committed 2c31287

    Generate a function resolver for the OpenGL/ES 2.0 API.

  • 07:10

    

    sarasmit committed 54a62f4

    Review commentary.

  • 04:16

    

    thoughthorizon committed 22b4c8f

    Added the CORRECT changes for using QUrl as a means of referring to local files across all systems (well, it works under Windows(TM) at least). This is untested on Mac/Linux, so if I've broken anything, ILFTYP.

  • 04:06

    

    sarasmit committed 7374943

    Interim commit for review.

  • 04:04

    

    thoughthorizon committed a29f311

    Merge branch 'master' of scm.dev.nokia.troll.no:research/qt3d

  • 04:03

    

    thoughthorizon committed faf84f7

    Revert "Added critical debug information & modifications to ensure that using QUrl for local files works correctly (on Windows, and according to the spec, everywhere else)."

  • 03:49

    

    thoughthorizon committed 1af2ea6

    Added critical debug information & modifications to ensure that using QUrl for local files works correctly (on Windows, and according to the spec, everywhere else).

• Thursday July 01 2010

  • 08:39

    

    Julian de Bhal committed 6b1c9c6

    Ensure a resource is ready before setting it as a texture

  • 08:39

    

    Julian de Bhal committed a3d9b2d

    Fix crash in qgl effect related to pixmap cache