Re: [osg-users] Submission/Pull Request problems on github

[John Hughes]

Hi Robert,


robertosfield wrote:
> 
> I'm struggling to find a way to get git to allow me to
> merge one file at a time and presented with a graphics diff that
> allows me to individually accept/discard changes.
> 


There are great tools that do exactly this. I use kdiff3.

http://www.gitguys.com/topics/merging-with-a-gui/

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=67189#67189





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Setting up travis for OSG in github

[John Hughes]

Hi Jordi,

I was actually just thinking this morning about this.

Most modern software development teams these days use a continuous integration 
solution like Travis, along with an automated regression suite.

I've had plenty experience maintaining both, so let me know if I can be of help.

Cheers,
John

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=67179#67179





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

[osg-users] REGISTER_WINDOWINGSYSTEMINTERFACE() breaks build

[John Hughes]

Hi folks,

In commit fe6238, a macro was added to osg/GraphicsContext:


Code:
#define REGISTER_WINDOWINGSYSTEMINTERFACE(ext, classname) \
extern "C" void graphicswindow_##ext(void) {} \
static osg::WindowingSystemInterfaceProxy s_proxy_##classname(#ext);



This unfortunately doesn’t quite work as intended in some of the 
osgViewer/GraphicsWindow* implementation classes:

GraphicsWindowCocoa.mm,
GraphicsWindowIOS.mm,
GraphicsWindowCarbon.cpp

For example in GraphicsWindowCocoa, the macro is invoked as follows:


Code:
REGISTER_WINDOWINGSYSTEMINTERFACE(Cocoa, 
osgViewer::CocoaWindowingSystemInterface)



However the "osgViewer::CocoaWindowingSystemInterface” is viewed as 3 separate 
tokens by the preprocessor, and so replaces “##classname” with only “osg”.

Here is a proposed work-around:


Code:
#define REGISTER_WINDOWINGSYSTEMINTERFACE(ext, ns, classname) \
extern "C" void graphicswindow_##ext(void) {} \
static osg::WindowingSystemInterfaceProxy 
s_proxy_##classname(#ext);





…


Code:

REGISTER_WINDOWINGSYSTEMINTERFACE(Cocoa, osgViewer, 
CocoaWindowingSystemInterface)




regards,
John

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=67147#67147





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org