sandstranger
a7b78b37f5
disable opengles for Android by default
2016-02-25 22:39:18 +03:00
Marc Zinnschlag
28e3fe837f
Merge remote-tracking branch 'scrawl/osg_34'
2016-02-14 17:31:33 +01:00
scrawl
eaf3f5a829
Remove unused arguments
2016-02-13 04:14:05 +01:00
scrawl
6fc6913424
Do not set the cursor when creating it
2016-02-13 03:34:09 +01:00
scrawl
5824619a95
Clean up includes
2016-02-12 19:28:10 +01:00
scrawl
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
, we're using OSG functionality that contains an unfixed crash bug in version 3.2. The bug is fixed in version 3.4 (OSG commit 6351e5020371b0b72b300088a5c6772f58379b84)
2016-02-12 14:46:45 +01:00
scrawl
e8662bea31
Change the way that image origin is converted to OpenGL's lower-left convention
...
Flip the texture coordinates instead of flipping textures.
This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
2016-02-05 21:03:11 +01:00
scrawl
78a733a12c
Fix initialization of InputWrapper::mWindowHasFocus
2015-12-15 20:13:41 +01:00
scrawl
6f966b8434
Don't use osg::notify
2015-12-11 16:18:08 +01:00
Paul Cercueil
06719df868
Use the standard cursor if the custom cursor can't be used
...
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2015-12-11 15:59:59 +01:00
scrawl
293f3f30b5
Indentation fix
2015-12-09 23:30:24 +01:00
sandstranger
238a5824be
add custom new variable fot Qt
2015-12-03 08:54:14 +03:00
sandstranger
bd5057aa3c
enable opengl es1
2015-12-02 22:40:04 +03:00
scrawl
7776c49fc1
GraphicsWindowSDL2: adjust the log levels
2015-11-10 18:42:59 +01:00
scrawl
0409e5a043
Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change)
2015-11-10 18:28:58 +01:00
scrawl
a47617c21f
Fix tab indentations in apps/ and components/
2015-09-16 20:45:37 +02:00
Nikolay Kasyanov
166df28906
OS X cursor workaround build fix
2015-08-19 21:23:16 +02:00
scrawl
4a68ceaeb7
Restrict the OS X cursor workaround to Intel graphics systems
2015-08-19 19:06:24 +02:00
scrawl
af5ffa5548
Don't warn about SDL touch events
2015-08-15 22:53:29 +02:00
scrawl
47ac20af40
Workaround flipped cursor on OS X
2015-08-15 22:28:59 +02:00
slothlife
420789baa9
Remove an unused include
2015-07-17 15:26:04 -05:00
slothlife
1b3cc957f8
Move some OSG static library setup code
2015-07-17 15:13:43 -05:00
slothlife
df99d5a59d
Move setup code for OSG when statically linked
2015-07-17 09:56:21 -05:00
scrawl
de6dc21552
Create hardware cursors in advance ( Fixes #2660 )
2015-07-13 23:36:25 +02:00
scrawl
35b2d91fb3
Throw error when failing to create graphics context
2015-06-10 18:46:51 +02:00
scrawl
9c9b83f8e2
Changes to compile with osg-svn 3.3.8
2015-06-07 23:51:54 +02:00
scrawl
e642f20a65
Restore screenshot key functionality
2015-06-03 17:25:18 +02:00
scrawl
1cdb440b77
glReadPixels *is* available on OpenGL ES
2015-05-28 17:23:06 +02:00
scrawl
9ee63dc3f4
Change stats viewer key to f3
2015-05-28 16:28:48 +02:00
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
scrawl
314c1161ae
Minor addition to reading display
2015-05-18 21:05:17 +02:00
scrawl
99eb78fc19
Fix $DISPLAY not being accounted for in cursor decompression context
2015-05-17 22:16:14 +02:00
scrawl
737c2114dc
Change viewer stats keybinding to F9
2015-05-15 19:43:48 +02:00
scrawl
5442bf23a6
Apply video mode & gamma setting changes
2015-05-14 20:31:16 +02:00
scrawl
5dd1b2ae86
Readded HW cursor rotation
2015-05-14 01:06:33 +02:00
scrawl
c775cbbbaa
Silence an annoying message
2015-05-14 00:40:51 +02:00
scrawl
9ea416b852
Readded HW cursor manager (no image rotation yet)
2015-05-13 18:56:14 +02:00
scrawl
39fb46601a
Readded input & event handling
2015-05-13 16:50:47 +02:00
scrawl
298b3ed2ef
Create the GraphicsWindowSDL2 directly
2015-05-13 15:08:47 +02:00
scrawl
0498e6e5f0
Readded window icon
2015-05-13 15:03:21 +02:00
scrawl
375b736e74
Use SDL to create the window
...
No input nor event loop handling yet, so the window will "stop responding" after a few seconds.
Thanks to KittyCat for the GraphicsWindowSDL2 code.
2015-05-13 02:53:09 +02:00