FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into shader_pipeline

Browse Source
This commit is contained in:
Robert Osfield 2017-12-04 18:46:24 +00:00
commit bad8939022
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
AUTHORS.txt
View File

@ -8,11 +8,11 @@ Robert Osfield
Stephan Huber Stephan Huber
Paul Martz Paul Martz
Farshid Lashkari Farshid Lashkari
Mathias Frhlich Mathias Fröhlich
Laurens Voerman Laurens Voerman
Marco Jez Marco Jez
Wang Rui Wang Rui
Jean-Sbastien Guay Jean-Sébastien Guay
Ulrich Hertlein Ulrich Hertlein
Mike Weiblen Mike Weiblen
Sukender Sukender
@ -66,11 +66,11 @@ Norman Vine
Chris Denham Chris Denham
Sherman Wilcox Sherman Wilcox
Serge Lages Serge Lages
Romano Jos Magacho da Silva Romano José Magacho da Silva
Mourad Boufarguine Mourad Boufarguine
Alberto Farre Alberto Farre
Glenn Waldron Glenn Waldron
Andr Garneau André Garneau
Adrian Egli Adrian Egli
Sebastian Messerschmidt Sebastian Messerschmidt
Randall Hopper Randall Hopper
@ -85,7 +85,7 @@ Michael Gronager
Martin Naylor Martin Naylor
Joakim Simonsson Joakim Simonsson
David Spilling David Spilling
Daniel Sjlie Daniel Sjölie
Bryan Thrall Bryan Thrall
Andreas Ekstrand Andreas Ekstrand
Rafa Gaitan Rafa Gaitan
@ -122,7 +122,7 @@ Gordon Tomlinson
Frederic Marmond Frederic Marmond
Frederic Bouvier Frederic Bouvier
Carlo Camporesi Carlo Camporesi
Bjrn Blissing Björn Blissing
Alexander Sinditskiy Alexander Sinditskiy
Vladimir Chebaev Vladimir Chebaev
Thibault Genessay Thibault Genessay
@ -141,7 +141,7 @@ Uwe Woessner
Tony Horrobin Tony Horrobin
Thom DeCarlo Thom DeCarlo
Tatsuhiro Nishioka Tatsuhiro Nishioka
Tanguy Fautr Tanguy Fautré
Sean Spicer Sean Spicer
Ryan Kawicki Ryan Kawicki
Richard Schmidt Richard Schmidt
@ -202,7 +202,7 @@ Phil Atkin
Pawel Ksiezopolski Pawel Ksiezopolski
Patrick Neary Patrick Neary
Nathan Monteleone Nathan Monteleone
Miha Ravelj Miha Rav¨elj
Miguel Escriva Miguel Escriva
Mattias Linde Mattias Linde
Mark Sciabica Mark Sciabica
@ -234,8 +234,8 @@ Christian Ruzicka
Christian Buchner Christian Buchner
Charles Cole Charles Cole
Blake Williams Blake Williams
Bjrn Hein Björn Hein
Aurlien Chatelain Aurélien Chatelain
Antoine Hue Antoine Hue
Andrew Bettison Andrew Bettison
Andreas Henne Andreas Henne
@ -264,7 +264,7 @@ Paul Obermeier
Nguyen Van Truong Nguyen Van Truong
Nathan Cournia Nathan Cournia
Morten Haukness Morten Haukness
Morn Pistorius Morné Pistorius
Michael Mc Donnell Michael Mc Donnell
Michael Henheffer Michael Henheffer
Michael Guerrero Michael Guerrero
@ -297,7 +297,7 @@ Guillaume Taze
Guillaume Chouvenc Guillaume Chouvenc
Giuseppe Donvito Giuseppe Donvito
Gill Peacegood Gill Peacegood
Giampaolo Vigan Giampaolo Viganò
Gerrick Bivins Gerrick Bivins
George Tarantilis George Tarantilis
Ferdi Smit Ferdi Smit
@ -305,7 +305,7 @@ Eduardo Poyart
Edgar Ellis Edgar Ellis
Dmitry Marakasov Dmitry Marakasov
Dimi Christopoulos Dimi Christopoulos
Diane Delalle Diane Delallée
David Longest David Longest
David Ergo David Ergo
Daniel Trstenjak Daniel Trstenjak
@ -337,7 +337,7 @@ Vasily Radostev
Valery Bickov Valery Bickov
Valeriy Dubov Valeriy Dubov
Vaclav Bilek Vaclav Bilek
Tyge Lvset Tyge Løvset
Troy Yee Troy Yee
Torben Dannahauer Torben Dannahauer
Tony Vasile Tony Vasile
@ -387,7 +387,7 @@ Piotr Rak
Pierre Bourdin Pierre Bourdin
Philipp Svehla Philipp Svehla
Philipp Siemoleit Philipp Siemoleit
Philipp Mchler Philipp Mächler
Philip Lamb Philip Lamb
Petr Salinger Petr Salinger
Peter Bear Peter Bear
@ -412,7 +412,7 @@ Nick Thu
Nick Black Nick Black
Mojtaba Fathi Mojtaba Fathi
Mirko Viviani Mirko Viviani
Mikkel Gjl Mikkel Gjøl
Mike Krus Mike Krus
Mike Garrity Mike Garrity
Mick Thu Mick Thu
@ -465,7 +465,7 @@ Juan Hernando
Josh Portway Josh Portway
Jonathan Greig Jonathan Greig
John Tan John Tan
John Hedstrm John Hedström
John Grant John Grant
John Farrier John Farrier
John Donovan John Donovan
@ -524,11 +524,11 @@ David Jung
Danny Valente Danny Valente
Daniel Stien Daniel Stien
Dan Minor Dan Minor
Csar L. B. Silveira César L. B. Silveira
Cyril Brulebois Cyril Brulebois
Curtis Rubel Curtis Rubel
Cory Slep Cory Slep
Clment Bsch Clément B½sch
Clay Fowler Clay Fowler
Claus Steuer Claus Steuer
Chuck Sembroski Chuck Sembroski

2
applications/present3D/ReadShowFile.cpp
View File

@ -256,7 +256,7 @@ osg::ref_ptr<osg::Node> p3d::readShowFiles(osg::ArgumentParser& arguments,const
nodeList.push_back(node); nodeList.push_back(node);
// make sure that this presentation isn't cached // make sure that this presentation isn't cached
osgDB::Registry::instance()->removeFromObjectCache( arguments[pos] ); osgDB::Registry::instance()->removeFromObjectCache( arguments[pos], local_options.get());
} }
} }
} }

2
src/osgPresentation/SlideEventHandler.cpp
View File

@ -1240,7 +1240,7 @@ bool SlideEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIAction
_hold = false; _hold = false;
return true; return true;
} }
else if (ea.getKey()=='e') else if (ea.getKey()=='R')
{ {
// reload presentation to reflect changes from editor // reload presentation to reflect changes from editor
setRequestReload(true); setRequestReload(true);

12
src/osgViewer/GraphicsWindowWin32.cpp
View File

@ -96,9 +96,9 @@ enum tagPOINTER_INPUT_TYPE {
PT_TOUCH = 0x00000002, // Touch PT_TOUCH = 0x00000002, // Touch
PT_PEN = 0x00000003, // Pen PT_PEN = 0x00000003, // Pen
PT_MOUSE = 0x00000004, // Mouse PT_MOUSE = 0x00000004, // Mouse
#if(WINVER >= 0x0603) //#if(WINVER >= 0x0603)
PT_TOUCHPAD = 0x00000005, // Touchpad PT_TOUCHPAD = 0x00000005, // Touchpad
#endif /* WINVER >= 0x0603 */ //#endif /* WINVER >= 0x0603 */
}; };
typedef DWORD POINTER_INPUT_TYPE; typedef DWORD POINTER_INPUT_TYPE;
@ -145,7 +145,7 @@ static GetTouchInputInfoFunc *getTouchInputInfoFunc = NULL;
static GetPointerTypeFunc *getPointerTypeFunc = NULL; static GetPointerTypeFunc *getPointerTypeFunc = NULL;
// DPI Awareness // DPI Awareness
#if(WINVER >= 0x0603) // #if(WINVER >= 0x0603)
#ifndef DPI_ENUMS_DECLARED #ifndef DPI_ENUMS_DECLARED
@ -163,7 +163,7 @@ BOOL
PROCESS_DPI_AWARENESS dpi_awareness)); PROCESS_DPI_AWARENESS dpi_awareness));
static SetProcessDpiAwarenessFunc *setProcessDpiAwareness = NULL; static SetProcessDpiAwarenessFunc *setProcessDpiAwareness = NULL;
#endif // #endif
@ -787,7 +787,7 @@ Win32WindowingSystem::Win32WindowingSystem()
} }
#if(WINVER >= 0x0603) // #if(WINVER >= 0x0603)
// For Windows 8.1 and higher // For Windows 8.1 and higher
// //
// Per monitor DPI aware.This app checks for the DPI when it is created and adjusts the scale factor // Per monitor DPI aware.This app checks for the DPI when it is created and adjusts the scale factor
@ -799,7 +799,7 @@ Win32WindowingSystem::Win32WindowingSystem()
(*setProcessDpiAwareness)(PROCESS_DPI_AWARENESS::PROCESS_PER_MONITOR_DPI_AWARE); (*setProcessDpiAwareness)(PROCESS_DPI_AWARENESS::PROCESS_PER_MONITOR_DPI_AWARE);
} }
} }
#endif // #endif
} }
Win32WindowingSystem::~Win32WindowingSystem() Win32WindowingSystem::~Win32WindowingSystem()