[Libreoffice-commits] core.git: Changes to 'feature/chart_opengl_window_rebased'

Markus Mohrhard markus.mohrhard at collabora.co.uk
Thu Aug 28 12:15:00 PDT 2014


New branch 'feature/chart_opengl_window_rebased' available with the following commits:
commit 674934563de3ed0eb327c613dc4e1b5665843e55
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Thu Aug 28 21:00:42 2014 +0200

    ignore aggressive Nvidia GLSL compiler error messages
    
    Change-Id: Ifc83bd3fb1d0fcbc8056c72b2545a8a3aed00a64

commit 1f560defb431b094a6b7850469df21ef19e4ee94
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Aug 25 21:47:34 2014 +0200

    the DUMMY_CHART_FACTORY variable is not the only indicator for OpenGl charts
    
    Change-Id: Idab33c8611526dc4749b4dbe4fe84e68138b4f73

commit d57e6998add0a5953f51e9c5c25686241386e38f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Aug 25 19:09:39 2014 +0200

    cache the call to getenv
    
    Change-Id: I13095b13694aa092e3d5f542b5be12e703eb4590

commit c0e85e73ae83df13bee744fcf24a67b5f72cd124
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 25 19:55:03 2014 +0200

    Don't render with mp2DRenderer when we have 3D charts
    
    Change-Id: Icb224f2d3dd55580532b1c4c43781ad444e51a43

commit 340ece7dc91bc10d05b6baad352d61f17c1b7739
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 25 19:42:55 2014 +0200

    mpRenderer->init() needs a context
    
    Change-Id: I9f6ce17fcc590597f357bf3ded5fe3eb41fb3810

commit b2498d9b2bac704498b67f597c7a09600d0d8b7a
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 25 19:21:54 2014 +0200

    Oops, static was forgotten.
    
    Change-Id: I0c316581ab8bfb0a49420006a0801d13021bd1ca

commit eaf0d99aff2fbfa980dd1e6da4269fe7ce7b7853
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 25 19:17:03 2014 +0200

    Store env variable in a static variable instead
    
    Change-Id: I5d6067806645722faac3fe90cbec01b6963f7283

commit e2af53b2a53adf89fe5fe387fe065cbc2f3559df
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 25 19:03:27 2014 +0200

    Revert "Stop flickering in rendering of charts in Writer"
    
    Hide when it's actually a normal chart.
    
    This reverts commit b79b862927d937d695b31df4bdb85d1fc8774f39.
    
    Change-Id: Ib7aee142cea979293864f3916eb0580a82605b2b

commit c27c3cbcffce3c5f093ebdb03b56c7749b36b85d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Aug 25 18:43:06 2014 +0200

    CHART_DUMMY_FACTORY should not control the OpenGL window
    
    Change-Id: Ic6c640f7d37606b357672f2b73f95d51d1daba67

commit 2eb2e96868995acd37df2cfde71829cea556746f
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Aug 22 18:31:31 2014 +0200

    Call resetCurrent as soon as possible to avoid conflict with other thread
    
    Change-Id: Ie3edc252135301ba5b85b80edcdbe75537d0da16

commit bbabf567a084bd5da9c3c0ee55c14a6ee1068be9
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Aug 22 10:08:07 2014 +0200

    Update chart when chart type is changed in edit mode
    
    Regression to master.
    In long term it would be better to define ChartWindow as an
    OpenGL window and not creating a new window inside the chart
    window, becasue otherwise all events which was handled well
    by the chart window will be broken (catched by the OpenGL
    window so no effect on ChartWindow (defining the behavior of
    charts in general) or catched by the ChartWindow and so no
    effect on the OpenGLWindow (like invalidating in this case).
    
    Change-Id: I234f469f70914e01f030c8edae9cb5aacea112bf

commit 3283d583d4867aff592e2315cd18159679ecf1a6
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Thu Aug 21 17:02:32 2014 +0200

    Reinitialize GL3D renderer when OpenGL window is changed
    
    Without it when we switch sheets in Calc or slides in Impress
    and go back to that page where the GL3DBar chart is then the
    renderer does not work.
    
    Change-Id: I9aa6203ed5aa7f94627d886b2f2e5ad34d493843

commit 8525257b19cfc5cb54862ba181df18c24149f8e1
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Thu Aug 21 16:00:14 2014 +0200

    Don't create an OpenGL window in case of normal charts.
    
    Change-Id: Idb4506712d3902c12aa881a85ddf69a281edff82

commit 7d1c417e811302534c4935d36083725f29efd885
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Thu Aug 21 10:47:31 2014 +0200

    Fix rendering of GL3DBarCharts after ODF import
    
    OpenGL window need to have a valid size before
    rendering.
    
    Change-Id: I3ce3dbf653f0dc101de3acc4d634d7fe6c3be9ad

commit db9bb2b433c567ef13e2d36cbc90e237608750e5
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 18 15:16:46 2014 +0200

    Stop flickering in rendering of charts in Writer
    
    Change-Id: I52efa9cd7851f480ee2abcaa1646735c6f518f3a

commit 938998668d0413aae1116a5ae0cf756c0f82fdbe
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 11 17:53:31 2014 +0200

    Add a border to opengl chart to make it easier to handle.
    
    Change-Id: I74bc636dc0a37d70f45fe2eac0b8b60e3f6318bb

commit 444eb454e948b33b54dff1e37d42eed5555c5ab3
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 11 14:27:16 2014 +0200

    This OpenGL window is useless
    
    Change-Id: Ied9914c9a317dc3945c29b984d2a68957275fc52

commit 7220e0ecb828c85b0988da6121145880cfcf6062
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 11 14:56:50 2014 +0200

    Fix regression in rendering of GL3DBarChart
    
    Change-Id: Ibf8f4a57cbc85f77a73054873030fcef321f5518

commit ef8195372d893ebe8e9e882ce132df0aa74a189a
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 11 10:18:04 2014 +0200

    Mirror vertically the texture bitmaps for OpenGL
    
    In case of glTF models it saves a Mirror() call.
    In case of OpenGL charts it avoid flipped texts.
    
    Change-Id: I1ac980e16bcb5ba6a9a025b638aaac3b08b4aab3

commit 5b0a4a5aceac6397a2a6f378407fc778cdbbb44a
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 4 12:04:10 2014 +0200

    It seems better if the caller allocates the memory for the RGBA buffer.
    
    For example it allows to use std::vector<> and call the method
    
    Change-Id: Id4b8e33838d358dd242d0176e42558505fa8d4a3

commit 6545632ae9396b1d08f03a4677455108b9cc330c
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 11 09:54:20 2014 +0200

    Make opengl chart window always active
    
    Fortunately there is a special ole object group with
    the MS_EMBED_ACTIVATEWHENVISIBLE flag which define this
    behaviour.
    Problem is that both Aspect and EmbedMisc are MS specific
    enums so we can't use them directly for non-MS objects. But we
    can handle opengl charts the same as this ole object group.
    
    Change-Id: I49abeffce319cbb775709a72ba198a1f76b65374

commit 601f2c6d3b3c79c16956ac500b6e1faa6ed0fb52
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sun Aug 10 17:18:16 2014 +0200

    ChartHelper::IsChart is useless
    
    EmbeddedObjectRef has an own IsChart method with the same
    behavior.
    
    Change-Id: Ib06699186466bf3da2bd67d7c631a5216463fb14

commit 42b41f52b59010c016a07ba3cf7d03b2acbb575e
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sun Aug 10 16:47:39 2014 +0200

    Add a method to check whether an XEmbeddedObject is a chart
    
    Change-Id: I6f860b9f1bce200c5366df0a32650705cf429a80

commit cbd9d5d498215a7f59a8326d89149bb81c678fa1
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Aug 8 13:44:42 2014 +0200

    Fix OpenGL chart reinitialiation
    
    Problem after ChartWindow was disabled and enabled
    again, OpenGL content was lost.
    
    Two things:
    -After setting a new OpenGLWindow the corresponding
    IRenderer must be set (x3DWindowProvider->update)
    -InitOpenGL() call should not depend on DummyChart, but on
    OpenGLWindow (OpenGLContext).
    
    Change-Id: If74e1945de9973d3921ceea1ca6fef39311add7a

commit 3321a6d431e8e165d20932f0454d6b0fa42e7066
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Sat May 17 04:32:58 2014 +0200

    opengl charts: Move the init from sc to chart2, to have the right parent.
    
    Conflicts:
    	chart2/source/view/charttypes/GL3DBarChart.cxx
    
    Change-Id: I1e23329345e00e7d8e1f269c832e84d015824c0a



More information about the Libreoffice-commits mailing list