Update of /cvsroot/opendx2/dxsamples/supervise/interactors
In directory sheep:/tmp/cvs-serv30975
Modified Files:
module_make.in myinteractors.c
Log Message:
Fix this interactor to work as a runtime loadable interactor.
Fix the makefile up to actually work.
Index: module_make.in
===================================================================
RCS file: /cvsroot/opendx2/dxsamples/supervise/interactors/module_make.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** module_make.in 1 Feb 2000 20:33:37 -0000 1.1
--- module_make.in 24 Oct 2007 05:11:06 -0000 1.2
***************
*** 11,16 ****
CC = $(DXCC)
! LIBS = -L$(BASE)/[EMAIL PROTECTED]@ -lDX \
! -lGL \
$(DXEXECLINKLIBS)
--- 11,15 ----
CC = $(DXCC)
! LIBS = -L$(BASE)/[EMAIL PROTECTED]@ -lm -lDX -lGL \
$(DXEXECLINKLIBS)
***************
*** 21,29 ****
myinteractors: myinteractors.o
-rm myinteractors
! $(MAKE) -f interactors_make loadable_interactors || $(MAKE) -f
interactors_make loadable_aix_interactors || $(MAKE) -f unrtloadable_dxexec
loadable_interactors:
! $(CCLD) $(DXABI) $(DX_RTL_LDFLAGS) -e DXEntry \
! -o myinteractors myinteractors.o -lm
loadable_aix_interactors:
--- 20,28 ----
myinteractors: myinteractors.o
-rm myinteractors
! $(MAKE) -f module_make loadable_interactors || $(MAKE) -f module_make
loadable_aix_interactors || $(MAKE) -f module_make unrtloadable_dxexec
loadable_interactors:
! $(CC) -o myinteractors $(DXABI) $(DX_RTL_LDFLAGS) \
! $(DX_RTL_DXENTRY) myinteractors.o $(LIBS)
loadable_aix_interactors:
***************
*** 33,34 ****
--- 32,35 ----
$(CCLD) $(DXABI) $(LDLIBFLAGS) myinteractors.o $(LIBS) -o dxexec
+ clean:
+ rm -f myinteractors myinteractors.o
Index: myinteractors.c
===================================================================
RCS file: /cvsroot/opendx2/dxsamples/supervise/interactors/myinteractors.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** myinteractors.c 17 May 2006 14:38:25 -0000 1.2
--- myinteractors.c 24 Oct 2007 05:11:06 -0000 1.3
***************
*** 47,50 ****
--- 47,51 ----
static UserInteractor _userInteractionTable[N_USER_INTERACTORS];
+ #if defined(UNRTLOADABLE)
int
DXDefaultUserInteractors(int *n, void *t)
***************
*** 78,82 ****
return 1;
}
!
/***** Rotate *****/
--- 79,116 ----
return 1;
}
! #else
! int
! DXEntry(int *n, void *t)
! {
! _userInteractionTable[0].InitMode = RotateInitMode;
! _userInteractionTable[0].EndMode = RotateEndMode;
! _userInteractionTable[0].SetCamera = RotateSetCamera;
! _userInteractionTable[0].GetCamera = RotateGetCamera;
! _userInteractionTable[0].SetRenderable = RotateSetRenderable;
! _userInteractionTable[0].GetRenderable = RotateGetRenderable;
! _userInteractionTable[0].EventHandler = RotateEventHandler;
!
! _userInteractionTable[1].InitMode = PanInitMode;
! _userInteractionTable[1].EndMode = PanEndMode;
! _userInteractionTable[1].SetCamera = PanSetCamera;
! _userInteractionTable[1].GetCamera = PanGetCamera;
! _userInteractionTable[1].SetRenderable = PanSetRenderable;
! _userInteractionTable[1].GetRenderable = PanGetRenderable;
! _userInteractionTable[1].EventHandler = PanEventHandler;
!
! _userInteractionTable[2].InitMode = ZoomInitMode;
! _userInteractionTable[2].EndMode = ZoomEndMode;
! _userInteractionTable[2].SetCamera = ZoomSetCamera;
! _userInteractionTable[2].GetCamera = ZoomGetCamera;
! _userInteractionTable[2].SetRenderable = ZoomSetRenderable;
! _userInteractionTable[2].GetRenderable = ZoomGetRenderable;
! _userInteractionTable[2].EventHandler = ZoomEventHandler;
!
! *n = N_USER_INTERACTORS;
! *(long **)t = (long *)_userInteractionTable;
! return 1;
! }
! #endif
!
/***** Rotate *****/
_______________________________________________
opendx2-cvs mailing list
opendx2-cvs@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/opendx2-cvs
