Navigation

← Previous Changeset
Next Changeset →

Changeset 19019

Timestamp:

07/11/06 13:56:15 (2 years ago)

Author:

patrick

Message:

For too long now, we have gotten away with building the OpenGL and Performer
Draw Manager DLLs using the same dll{import,export} settings as the VR
Juggler library—a dependency of both. I'm surprised that it has continued
to work for a long as it has, but in order to make automatic linking work
in reasonably simple manner, we have to have separate symbol exporting stuff
for the VR Juggler DLL and for the Draw Manager DLLs.

Files:

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/Config.h (added)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlApp.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlApp.h (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlBasicSimulator.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlBasicSimulator.h (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlContextData.h (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawHeadFunctors.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawHeadFunctors.h (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawManager.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawManager.h (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawObjectFunctor.h (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawWandFunctors.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawWandFunctors.h (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlPipe.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlPipe.h (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlProcApp.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlProcApp.h (modified) (3 diffs)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlSimInterface.h (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlSimInterfaceFactory.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlSimInterfaceFactory.h (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlUserData.h (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindow.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindow.h (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowOSX.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowOSX.h (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowWin32.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowWin32.h (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowXWin.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowXWin.h (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/Config.h (added)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfApp.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfApp.h (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfBasicSimulator.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfBasicSimulator.h (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfDrawManager.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfDrawManager.h (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfInputHandler.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfInputHandler.h (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfSimInterface.h (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfSimInterfaceFactory.cpp (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfSimInterfaceFactory.h (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfUtil.cpp (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfUtil.h (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlApp.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/OGL/Config.h>
28	28
29	29	#include <vrj/Draw/OGL/GlDrawManager.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlApp.h

r18824	r19019
28	28	#define _VRJ_GL_APP_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/OGL/Config.h>
31	31
32	32	#include <vrj/Kernel/App.h>
…	…
72	72	* @see vrj::App, vrj::Kernel
73	73	*/
74		class VJ_CLASS_API GlApp : public App
	74	class VJ_OGL_CLASS_API GlApp : public App
75	75	{
76	76	public:

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlBasicSimulator.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/OGL/Config.h>
28	28
29	29	#include <boost/concept_check.hpp>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlBasicSimulator.h

r18824	r19019
28	28	#define _VRJ_GL_BASIC_SIMULATOR_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/OGL/Config.h>
31	31
32	32	#include <vrj/Draw/OGL/GlSimInterface.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlContextData.h

r18824	r19019
29	29	//#pragma once
30	30
31		#include <vrj/~~vrj~~Config.h>
	31	#include <vrj/Draw/OGL/Config.h>
32	32	#include <vector>
33	33	#include <vrj/Draw/OGL/GlDrawManager.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawHeadFunctors.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/OGL/Config.h>
28	28
29	29	#include <gmtl/Vec.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawHeadFunctors.h

r18824 r19019

28 28 #define _GL_DRAW_HEAD_FUNCTORS_H_
29 29
30 #include <vrj/~~vrj~~Config.h>
30 #include <vrj/Draw/OGL/Config.h>
31 31
32 32 #ifdef VPR_OS_Darwin

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawManager.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/OGL/Config.h>
28	28
29	29	#include <stdlib.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawManager.h

r18824	r19019
28	28	#define _VRJ_GL_DRAW_MANAGER_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/OGL/Config.h>
31	31	#include <vector>
32	32
…	…
74	74	* @date 1-7-98
75	75	*/
76		class VJ_CLASS_API GlDrawManager : public DrawManager
	76	class VJ_OGL_CLASS_API GlDrawManager : public DrawManager
77	77	{
78	78	public:

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawObjectFunctor.h

r18824 r19019

28 28 #define GL_DRAW_OBJECT_FUNCTOR_H
29 29
30 #include <vrj/~~vrj~~Config.h>
30 #include <vrj/Draw/OGL/Config.h>
31 31
32 32

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawWandFunctors.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/OGL/Config.h>
28	28
29	29	#include <boost/concept_check.hpp>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlDrawWandFunctors.h

r18824 r19019

29 29
30 30 #include <vpr/vprConfig.h>
31 #include <vrj/~~vrj~~Config.h>
31 #include <vrj/Draw/OGL/Config.h>
32 32
33 33 #ifdef VPR_OS_Darwin

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlPipe.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/OGL/Config.h>
28	28
29	29	#include <vpr/vpr.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlPipe.h

r18824	r19019
28	28	#define _VRJ_GL_PIPE_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/OGL/Config.h>
31	31	#include <vector>
32	32
…	…
49	49	* @date 1-12-98
50	50	*/
51		class VJ_CLASS_API GlPipe
	51	class VJ_OGL_CLASS_API GlPipe
52	52	{
53	53	public:

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlProcApp.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/OGL/Config.h>
28	28
29	29	#include <vrj/Kernel/Kernel.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlProcApp.h

r18824	r19019
28	28	#define _VRJ_GL_PROC_APP_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/OGL/Config.h>
31	31
32	32	#include <boost/function.hpp> // Could use function pointers, but this is a little easier to read
…	…
46	46	* \c vrj::App and \c vrj::GlApp interface methods implemented in this class.
47	47	*/
48		class VJ_CLASS_API GlProcAppWrapper : public vrj::GlApp
	48	class VJ_OGL_CLASS_API GlProcAppWrapper : public vrj::GlApp
49	49	{
50	50	public:
…	…
117	117	*/
118	118	//@{
119		VJ_API(void) VRJSetGLDrawMethod(vrj::GlProcAppWrapper::callback_t m);
	119	VJ_OGL_API(void) VRJSetGLDrawMethod(vrj::GlProcAppWrapper::callback_t m);
120	120
121		VJ_API(void) VRJSetGLContextInitMethod(vrj::GlProcAppWrapper::callback_t m);
	121	VJ_OGL_API(void) VRJSetGLContextInitMethod(vrj::GlProcAppWrapper::callback_t m);
122	122
123		VJ_API(void) VRJSetBufferPredrawMethod(vrj::GlProcAppWrapper::callback_t m);
	123	VJ_OGL_API(void) VRJSetBufferPredrawMethod(vrj::GlProcAppWrapper::callback_t m);
124	124
125		VJ_API(void) VRJSetPreFrameMethod(vrj::GlProcAppWrapper::callback_t m);
	125	VJ_OGL_API(void) VRJSetPreFrameMethod(vrj::GlProcAppWrapper::callback_t m);
126	126
127		VJ_API(void) VRJSetIntraFrameMethod(vrj::GlProcAppWrapper::callback_t m);
	127	VJ_OGL_API(void) VRJSetIntraFrameMethod(vrj::GlProcAppWrapper::callback_t m);
128	128
129		VJ_API(void) VRJSetPostFrameMethod(vrj::GlProcAppWrapper::callback_t m);
	129	VJ_OGL_API(void) VRJSetPostFrameMethod(vrj::GlProcAppWrapper::callback_t m);
130	130
131		VJ_API(void) VRJConfigure(int argc, char* argv[]);
	131	VJ_OGL_API(void) VRJConfigure(int argc, char* argv[]);
132	132
133	133	/** Start everything running */
134		VJ_API(void) VRJProcRunSystem();
	134	VJ_OGL_API(void) VRJProcRunSystem();
135	135	//@}
136	136	}

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlSimInterface.h

r18824	r19019
28	28	#define _VRJ_GL_SIM_INTERFACE_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/OGL/Config.h>
31	31
32	32	#include <gadget/Type/KeyboardMouseProxy.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlSimInterfaceFactory.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/OGL/Config.h>
28	28
29	29	#include <vrj/Draw/OGL/GlSimInterfaceFactory.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlSimInterfaceFactory.h

r18824	r19019
28	28	#define _VRJ_GL_SIM_INTERFACE_FACTORY_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/OGL/Config.h>
31	31	#include <string>
32	32	#include <vpr/Util/Factory.h>
…	…
56	56	* Simulator renderer factory.
57	57	*/
58		class VJ_CLASS_API GlSimInterfaceFactory :
	58	class VJ_OGL_CLASS_API GlSimInterfaceFactory :
59	59	public vpr::Factory<DrawSimInterface, std::string>
60	60	{

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlUserData.h

r18824 r19019

29 29 //#pragma once
30 30
31 #include <vrj/~~vrj~~Config.h>
31 #include <vrj/Draw/OGL/Config.h>
32 32
33 33 /*

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindow.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/OGL/Config.h>
28	28
29	29	#include <vpr/vpr.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindow.h

r18824	r19019
28	28	#define _VJ_GL_WINDOW_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/OGL/Config.h>
31	31	#include <vector>
32	32
…	…
58	58	* in this one class.
59	59	*/
60		class VJ_CLASS_API GlWindow
	60	class VJ_OGL_CLASS_API GlWindow
61	61	{
62	62	public:

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowOSX.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/OGL/Config.h>
28	28
29	29	#include <boost/concept_check.hpp>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowOSX.h

r18824 r19019

28 28 #define _VRJ_GL_WIN_OSX_H_
29 29
30 #include <vrj/~~vrj~~Config.h>
30 #include <vrj/Draw/OGL/Config.h>
31 31 #include <vector>
32 32

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowWin32.cpp

r18837	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/OGL/Config.h>
28	28
29	29	#include <iomanip>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowWin32.h

r18824	r19019
28	28	#define _VRJ_GL_WINDOW_WIN32_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/OGL/Config.h>
31	31
32	32	#pragma warning(disable:4786) // identifier truncated to 255 characters in the debug information
…	…
66	66	* Win32-specific OpenGL windowing class.
67	67	*/
68		class VJ_CLASS_API GlWindowWin32
	68	class VJ_OGL_CLASS_API GlWindowWin32
69	69	: public GlWindow
70	70	, public gadget::InputAreaWin32

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowXWin.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/OGL/Config.h>
28	28
29	29	#include <iomanip>

juggler/trunk/modules/vrjuggler/vrj/Draw/OGL/GlWindowXWin.h

r18824 r19019

29 29 //#pragma once
30 30
31 #include <vrj/~~vrj~~Config.h>
31 #include <vrj/Draw/OGL/Config.h>
32 32 #include <vector>
33 33

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfApp.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/Pf/Config.h>
28	28
29	29	#include <vrj/Draw/Pf/PfDrawManager.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfApp.h

r18824	r19019
28	28	#define _VRJ_PF_APP_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/Pf/Config.h>
31	31	#include <vector>
32	32	#include <boost/concept_check.hpp>
…	…
52	52	* Draw Manager will use to interact with the user's application.
53	53	*/
54		class VJ_CLASS_API PfApp : public App
	54	class VJ_PF_CLASS_API PfApp : public App
55	55	{
56	56	public:

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfBasicSimulator.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/Pf/Config.h>
28	28
29	29	#include <gmtl/Matrix.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfBasicSimulator.h

r18824	r19019
28	28	#define _VRJ_PF_BASIC_SIMULATOR_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/Pf/Config.h>
31	31
32	32	#include <vrj/Draw/Pf/PfSimInterface.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfDrawManager.cpp

r18824 r19019

26 26 #define PF_C_API 1
27 27
28 #include <vrj/~~vrj~~Config.h>
28 #include <vrj/Draw/Pf/Config.h>
29 29
30 30 #include <iomanip>

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfDrawManager.h

r18824	r19019
28	28	#define _VRJ_PF_DRAW_MANAGER_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/Pf/Config.h>
31	31
32	32	#include <vector>
…	…
69	69	* Responsible for all Performer rendering and windowing.
70	70	*/
71		class VJ_CLASS_API PfDrawManager : public DrawManager
	71	class VJ_PF_CLASS_API PfDrawManager : public DrawManager
72	72	{
73	73	protected:

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfInputHandler.cpp

r18824 r19019

27 27 #define PF_C_API 1
28 28
29 #include <vrj/~~vrj~~Config.h>
29 #include <vrj/Draw/Pf/Config.h>
30 30
31 31 #include <iostream>
juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfInputHandler.h

r18824 r19019

28 28 #define _VRJ_PF_INPUT_HANDLER_H_
29 29
30 #include <vrj/~~vrj~~Config.h>
30 #include <vrj/Draw/Pf/Config.h>
31 31
32 32 #include <string>

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfSimInterface.h

r18824	r19019
28	28	#define _VRJ_PF_SIM_INTERFACE_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/Pf/Config.h>
31	31
32	32	#include <gadget/Type/KeyboardMouseProxy.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfSimInterfaceFactory.cpp

r18824	r19019
25	25	************* <auto-copyright.pl END do not edit this line> *************/
26	26
27		#include <vrj/~~vrj~~Config.h>
	27	#include <vrj/Draw/Pf/Config.h>
28	28
29	29	#include <vrj/Draw/Pf/PfSimInterfaceFactory.h>

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfSimInterfaceFactory.h

r18824	r19019
28	28	#define _VRJ_PF_SIM_INTERFACE_FACTORY_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/Pf/Config.h>
31	31	#include <string>
32	32	#include <vpr/Util/Factory.h>
…	…
56	56	* Simulator renderer factory.
57	57	*/
58		class VJ_CLASS_API PfSimInterfaceFactory :
	58	class VJ_PF_CLASS_API PfSimInterfaceFactory :
59	59	public vpr::Factory<DrawSimInterface, std::string>
60	60	{

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfUtil.cpp

r18824	r19019
24	24	*
25	25	************* <auto-copyright.pl END do not edit this line> *************/
	26	#include <vrj/Draw/Pf/Config.h>
26	27
27	28	#include <gmtl/Vec.h>
…	…
31	32	#include <gmtl/Math.h>
32	33
33		~~#include <vrj/vrjConfig.h>~~
34	34	#include <vrj/Draw/Pf/PfUtil.h>
35	35

juggler/trunk/modules/vrjuggler/vrj/Draw/Pf/PfUtil.h

r18824	r19019
32	32	***************************************************/
33	33
34		#include <vrj/~~vrj~~Config.h>
	34	#include <vrj/Draw/Pf/Config.h>
35	35
36	36	#include <Performer/pr/pfLinMath.h>
…	…
43	43
44	44	/** Converts Performer matrix to Juggler (GMTL) matrix. */
45		VJ_API(gmtl::Matrix44f) GetVjMatrix(const pfMatrix& perfMat);
	45	VJ_PF_API(gmtl::Matrix44f) GetVjMatrix(const pfMatrix& perfMat);
46	46
47	47	/** Converts Juggler (GMTL) matrix to Pf Matrix. */
48		VJ_API(pfMatrix) GetPfMatrix(const gmtl::Matrix44f& mat);
	48	VJ_PF_API(pfMatrix) GetPfMatrix(const gmtl::Matrix44f& mat);
49	49
50	50	/** Converts Performer 3-element vector to Juggler (GMTL) vector. */
51		VJ_API(gmtl::Vec3f) GetVjVec(const pfVec3& vec);
	51	VJ_PF_API(gmtl::Vec3f) GetVjVec(const pfVec3& vec);
52	52
53	53	/** Converts Juggler (GMTL) vector to Pf vector. */
54		VJ_API(pfVec3) GetPfVec(const gmtl::Vec3f& vec);
	54	VJ_PF_API(pfVec3) GetPfVec(const gmtl::Vec3f& vec);
55	55
56	56

r18824	r19019
28	28	#define _GL_DRAW_HEAD_FUNCTORS_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/OGL/Config.h>
31	31
32	32	#ifdef VPR_OS_Darwin

r18824	r19019
28	28	#define GL_DRAW_OBJECT_FUNCTOR_H
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/OGL/Config.h>
31	31
32	32

r18824	r19019
29	29
30	30	#include <vpr/vprConfig.h>
31		#include <vrj/~~vrj~~Config.h>
	31	#include <vrj/Draw/OGL/Config.h>
32	32
33	33	#ifdef VPR_OS_Darwin

r18824	r19019
28	28	#define _VRJ_GL_WIN_OSX_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/OGL/Config.h>
31	31	#include <vector>
32	32

r18824	r19019
26	26	#define PF_C_API 1
27	27
28		#include <vrj/~~vrj~~Config.h>
	28	#include <vrj/Draw/Pf/Config.h>
29	29
30	30	#include <iomanip>

r18824	r19019
28	28	#define _VRJ_PF_INPUT_HANDLER_H_
29	29
30		#include <vrj/~~vrj~~Config.h>
	30	#include <vrj/Draw/Pf/Config.h>
31	31
32	32	#include <string>

Navigation

Changeset 19019

Legend:

Download in other formats: