Revision: 75313
http://sourceforge.net/p/brlcad/code/75313
Author: starseeker
Date: 2020-04-08 23:17:26 +0000 (Wed, 08 Apr 2020)
Log Message:
-----------
osgl isn't working, but get it building. Not sure if it's these changes that
broke it, Tk 8.6, or something else...
Modified Paths:
--------------
brlcad/trunk/src/libdm/dm-generic.c
brlcad/trunk/src/libdm/dm-osgl.cpp
Modified: brlcad/trunk/src/libdm/dm-generic.c
===================================================================
--- brlcad/trunk/src/libdm/dm-generic.c 2020-04-08 23:11:05 UTC (rev 75312)
+++ brlcad/trunk/src/libdm/dm-generic.c 2020-04-08 23:17:26 UTC (rev 75313)
@@ -70,7 +70,7 @@
#endif /* DM_OSG*/
#ifdef DM_OSGL
-extern dm *osgl_open(Tcl_Interp *interp, int argc, const char **argv);
+extern dm *osgl_open(Tcl_Interp *interp, struct dm_context *context, int argc,
const char **argv);
extern void osgl_fogHint(dm *dmp, int fastfog);
extern int osgl_share_dlist(dm *dmp1, dm *dmp2);
#endif /* DM_OSGL*/
@@ -138,7 +138,7 @@
#endif
#ifdef DM_OSGL
case DM_TYPE_OSGL:
- return osgl_open(interp, argc, argv);
+ return osgl_open(interp, context, argc, argv);
#endif
#ifdef DM_RTGL
case DM_TYPE_RTGL:
Modified: brlcad/trunk/src/libdm/dm-osgl.cpp
===================================================================
--- brlcad/trunk/src/libdm/dm-osgl.cpp 2020-04-08 23:11:05 UTC (rev 75312)
+++ brlcad/trunk/src/libdm/dm-osgl.cpp 2020-04-08 23:17:26 UTC (rev 75313)
@@ -80,7 +80,7 @@
#define PLOTBOUND 1000.0 /* Max magnification in Rot matrix */
extern "C" {
- struct dm_internal *osgl_open(Tcl_Interp *interp, int argc, char **argv);
+ struct dm_internal *osgl_open(Tcl_Interp *interp, struct dm_context
*context, int argc, char **argv);
}
HIDDEN int osgl_close(struct dm_internal *dmp, struct dm_context *context);
HIDDEN int osgl_drawBegin(struct dm_internal *dmp);
@@ -102,7 +102,7 @@
HIDDEN int osgl_setBGColor(struct dm_internal *dmp, unsigned char r, unsigned
char g, unsigned char b);
HIDDEN int osgl_setLineAttr(struct dm_internal *dmp, int width, int style);
HIDDEN int osgl_configureWin_guts(struct dm_internal *dmp, int force);
-HIDDEN int osgl_configureWin(struct dm_internal *dmp, int force);
+HIDDEN int osgl_configureWin(struct dm_internal *dmp, struct dm_context
*context, int force);
HIDDEN int osgl_setLight(struct dm_internal *dmp, int lighting_on);
HIDDEN int osgl_setTransparency(struct dm_internal *dmp, int transparency_on);
HIDDEN int osgl_setDepthMask(struct dm_internal *dmp, int depthMask_on);
@@ -288,7 +288,7 @@
HIDDEN int
-osgl_configureWin(struct dm_internal *dmp, int force)
+osgl_configureWin(struct dm_internal *dmp, struct dm_context *UNUSED(context),
int force)
{
((struct osgl_vars
*)dmp->dm_vars.priv_vars)->graphicsContext->makeCurrent();
@@ -420,8 +420,8 @@
}
privvars = (struct osgl_vars *)dmp->dm_vars.priv_vars;
- if ((tkwin = (*context->dm_window_main)(dmp)) == NULL) {
- bu_free((void *)privars, "privars");
+ if ((tkwin = (Tk_Window)(*context->dm_window_main)(dmp)) == NULL) {
+ bu_free((void *)privvars, "privvars");
bu_free((void *)pubvars, "pubvars");
bu_free((void *)dmp, "dmp");
return DM_NULL;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
