Commit Graph

41 Commits (95dc1258d647375225d75184a17a6ed029c2b2d2)

Author SHA1 Message Date
sandstranger a7b78b37f5 disable opengles for Android by default 9 years ago
Marc Zinnschlag 28e3fe837f Merge remote-tracking branch 'scrawl/osg_34' 9 years ago
scrawl eaf3f5a829 Remove unused arguments 9 years ago
scrawl 6fc6913424 Do not set the cursor when creating it 9 years ago
scrawl 5824619a95 Clean up includes 9 years ago
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)
9 years ago
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.
9 years ago
scrawl 78a733a12c Fix initialization of InputWrapper::mWindowHasFocus 9 years ago
scrawl 6f966b8434 Don't use osg::notify 9 years ago
Paul Cercueil 06719df868 Use the standard cursor if the custom cursor can't be used
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
9 years ago
scrawl 293f3f30b5 Indentation fix 9 years ago
sandstranger 238a5824be add custom new variable fot Qt 9 years ago
sandstranger bd5057aa3c enable opengl es1 9 years ago
scrawl 7776c49fc1 GraphicsWindowSDL2: adjust the log levels 9 years ago
scrawl 0409e5a043 Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change) 9 years ago
scrawl a47617c21f Fix tab indentations in apps/ and components/ 9 years ago
Nikolay Kasyanov 166df28906 OS X cursor workaround build fix 10 years ago
scrawl 4a68ceaeb7 Restrict the OS X cursor workaround to Intel graphics systems 10 years ago
scrawl af5ffa5548 Don't warn about SDL touch events 10 years ago
scrawl 47ac20af40 Workaround flipped cursor on OS X 10 years ago
slothlife 420789baa9 Remove an unused include 10 years ago
slothlife 1b3cc957f8 Move some OSG static library setup code 10 years ago
slothlife df99d5a59d Move setup code for OSG when statically linked 10 years ago
scrawl de6dc21552 Create hardware cursors in advance (Fixes #2660) 10 years ago
scrawl 35b2d91fb3 Throw error when failing to create graphics context 10 years ago
scrawl 9c9b83f8e2 Changes to compile with osg-svn 3.3.8 10 years ago
scrawl e642f20a65 Restore screenshot key functionality 10 years ago
scrawl 1cdb440b77 glReadPixels *is* available on OpenGL ES 10 years ago
scrawl 9ee63dc3f4 Change stats viewer key to f3 10 years ago
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
10 years ago
scrawl 314c1161ae Minor addition to reading display 10 years ago
scrawl 99eb78fc19 Fix $DISPLAY not being accounted for in cursor decompression context 10 years ago
scrawl 737c2114dc Change viewer stats keybinding to F9 10 years ago
scrawl 5442bf23a6 Apply video mode & gamma setting changes 10 years ago
scrawl 5dd1b2ae86 Readded HW cursor rotation 10 years ago
scrawl c775cbbbaa Silence an annoying message 10 years ago
scrawl 9ea416b852 Readded HW cursor manager (no image rotation yet) 10 years ago
scrawl 39fb46601a Readded input & event handling 10 years ago
scrawl 298b3ed2ef Create the GraphicsWindowSDL2 directly 10 years ago
scrawl 0498e6e5f0 Readded window icon 10 years ago
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.
10 years ago