From 279df6d57ec2d4fd263e8a9360f960ac9ffcaed2 Mon Sep 17 00:00:00 2001 From: Anna Sokol Date: Mon, 4 Dec 2017 13:01:52 +0000 Subject: [PATCH 1/4] From Anna Sokol, "There is no need to specify WINVER of 0x0603 in order to check for the SetProcessDPIAwareness function existence. If your current OS where the application is running is Windows 8.1 or above it the function will exist in the dll or if its below it wont. I checked the attached code with both a Windows 7 desktop (where the function doesn't exist) and a Windows 10 tablet (where it does and had my screen scaled to 150%) and in both cases the code worked as intended." --- src/osgViewer/GraphicsWindowWin32.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/osgViewer/GraphicsWindowWin32.cpp b/src/osgViewer/GraphicsWindowWin32.cpp index 6905a8856..c96189518 100644 --- a/src/osgViewer/GraphicsWindowWin32.cpp +++ b/src/osgViewer/GraphicsWindowWin32.cpp @@ -96,9 +96,9 @@ enum tagPOINTER_INPUT_TYPE { PT_TOUCH = 0x00000002, // Touch PT_PEN = 0x00000003, // Pen PT_MOUSE = 0x00000004, // Mouse -#if(WINVER >= 0x0603) +//#if(WINVER >= 0x0603) PT_TOUCHPAD = 0x00000005, // Touchpad -#endif /* WINVER >= 0x0603 */ +//#endif /* WINVER >= 0x0603 */ }; typedef DWORD POINTER_INPUT_TYPE; @@ -145,7 +145,7 @@ static GetTouchInputInfoFunc *getTouchInputInfoFunc = NULL; static GetPointerTypeFunc *getPointerTypeFunc = NULL; // DPI Awareness -#if(WINVER >= 0x0603) +// #if(WINVER >= 0x0603) #ifndef DPI_ENUMS_DECLARED @@ -163,7 +163,7 @@ BOOL PROCESS_DPI_AWARENESS dpi_awareness)); static SetProcessDpiAwarenessFunc *setProcessDpiAwareness = NULL; -#endif +// #endif @@ -787,10 +787,10 @@ Win32WindowingSystem::Win32WindowingSystem() } -#if(WINVER >= 0x0603) - // For Windows 8.1 and higher +// #if(WINVER >= 0x0603) + // 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 // whenever the DPI changes.These applications are not automatically scaled by the system. HMODULE hModuleShore = LoadLibrary("Shcore"); if (hModuleShore) { @@ -799,7 +799,7 @@ Win32WindowingSystem::Win32WindowingSystem() (*setProcessDpiAwareness)(PROCESS_DPI_AWARENESS::PROCESS_PER_MONITOR_DPI_AWARE); } } -#endif +// #endif } Win32WindowingSystem::~Win32WindowingSystem() From 56681c89cd166541be6d3028a2f35594ebb797b4 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 4 Dec 2017 14:50:12 +0000 Subject: [PATCH 2/4] Changed the reload presentaiton key to 'R' to better match the 'E' for editor --- src/osgPresentation/SlideEventHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgPresentation/SlideEventHandler.cpp b/src/osgPresentation/SlideEventHandler.cpp index 8e2ff0b8c..3d56918aa 100644 --- a/src/osgPresentation/SlideEventHandler.cpp +++ b/src/osgPresentation/SlideEventHandler.cpp @@ -1240,7 +1240,7 @@ bool SlideEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIAction _hold = false; return true; } - else if (ea.getKey()=='e') + else if (ea.getKey()=='R') { // reload presentation to reflect changes from editor setRequestReload(true); From 7f0baaab616d01078c0f1f5fac4e352f993202a0 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 4 Dec 2017 16:43:08 +0000 Subject: [PATCH 3/4] Added passing of the osgDB::Options to the remove from cache to make sure the cache model for the presentation is found and removed. --- applications/present3D/ReadShowFile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/present3D/ReadShowFile.cpp b/applications/present3D/ReadShowFile.cpp index 147a54bda..474660cb5 100644 --- a/applications/present3D/ReadShowFile.cpp +++ b/applications/present3D/ReadShowFile.cpp @@ -256,7 +256,7 @@ osg::ref_ptr p3d::readShowFiles(osg::ArgumentParser& arguments,const nodeList.push_back(node); // make sure that this presentation isn't cached - osgDB::Registry::instance()->removeFromObjectCache( arguments[pos] ); + osgDB::Registry::instance()->removeFromObjectCache( arguments[pos], local_options.get()); } } } From 551e9ba17c07129f78fbddb7468fdf32994be582 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 4 Dec 2017 17:51:21 +0000 Subject: [PATCH 4/4] Fixed AUTHORS --- AUTHORS.txt | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index f7b2a94ec..6bd66ef68 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -8,11 +8,11 @@ Robert Osfield Stephan Huber Paul Martz Farshid Lashkari -Mathias Frhlich +Mathias Fröhlich Laurens Voerman Marco Jez Wang Rui -Jean-Sbastien Guay +Jean-Sébastien Guay Ulrich Hertlein Mike Weiblen Sukender @@ -66,11 +66,11 @@ Norman Vine Chris Denham Sherman Wilcox Serge Lages -Romano Jos Magacho da Silva +Romano José Magacho da Silva Mourad Boufarguine Alberto Farre Glenn Waldron -Andr Garneau +André Garneau Adrian Egli Sebastian Messerschmidt Randall Hopper @@ -85,7 +85,7 @@ Michael Gronager Martin Naylor Joakim Simonsson David Spilling -Daniel Sjlie +Daniel Sjölie Bryan Thrall Andreas Ekstrand Rafa Gaitan @@ -122,7 +122,7 @@ Gordon Tomlinson Frederic Marmond Frederic Bouvier Carlo Camporesi -Bjrn Blissing +Björn Blissing Alexander Sinditskiy Vladimir Chebaev Thibault Genessay @@ -141,7 +141,7 @@ Uwe Woessner Tony Horrobin Thom DeCarlo Tatsuhiro Nishioka -Tanguy Fautr +Tanguy Fautré Sean Spicer Ryan Kawicki Richard Schmidt @@ -202,7 +202,7 @@ Phil Atkin Pawel Ksiezopolski Patrick Neary Nathan Monteleone -Miha Ravelj +Miha Rav¨elj Miguel Escriva Mattias Linde Mark Sciabica @@ -234,8 +234,8 @@ Christian Ruzicka Christian Buchner Charles Cole Blake Williams -Bjrn Hein -Aurlien Chatelain +Björn Hein +Aurélien Chatelain Antoine Hue Andrew Bettison Andreas Henne @@ -264,7 +264,7 @@ Paul Obermeier Nguyen Van Truong Nathan Cournia Morten Haukness -Morn Pistorius +Morné Pistorius Michael Mc Donnell Michael Henheffer Michael Guerrero @@ -297,7 +297,7 @@ Guillaume Taze Guillaume Chouvenc Giuseppe Donvito Gill Peacegood -Giampaolo Vigan +Giampaolo Viganò Gerrick Bivins George Tarantilis Ferdi Smit @@ -305,7 +305,7 @@ Eduardo Poyart Edgar Ellis Dmitry Marakasov Dimi Christopoulos -Diane Delalle +Diane Delallée David Longest David Ergo Daniel Trstenjak @@ -337,7 +337,7 @@ Vasily Radostev Valery Bickov Valeriy Dubov Vaclav Bilek -Tyge Lvset +Tyge Løvset Troy Yee Torben Dannahauer Tony Vasile @@ -387,7 +387,7 @@ Piotr Rak Pierre Bourdin Philipp Svehla Philipp Siemoleit -Philipp Mchler +Philipp Mächler Philip Lamb Petr Salinger Peter Bear @@ -412,7 +412,7 @@ Nick Thu Nick Black Mojtaba Fathi Mirko Viviani -Mikkel Gjl +Mikkel Gjøl Mike Krus Mike Garrity Mick Thu @@ -465,7 +465,7 @@ Juan Hernando Josh Portway Jonathan Greig John Tan -John Hedstrm +John Hedström John Grant John Farrier John Donovan @@ -524,11 +524,11 @@ David Jung Danny Valente Daniel Stien Dan Minor -Csar L. B. Silveira +César L. B. Silveira Cyril Brulebois Curtis Rubel Cory Slep -Clment Bsch +Clément B½sch Clay Fowler Claus Steuer Chuck Sembroski