Changeset 13


Ignore:
Timestamp:
10/07/08 10:54:05 (4 years ago)
Author:
gwesche
Message:

avango-tools for windows. Added checkEvents for Win32 graphics windows

Location:
trunk
Files:
2 added
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/SConstruct

    r11 r13  
    9595        avango.build.SConscript('avango-daemon/SConscript') 
    9696if not avango.build.oshelper.os_is_windows(): #FIXME get module running under Windows 
    97     avango.build.SConscript('avango-tools/SConscript') 
    9897    avango.build.SConscript('avango-sound/SConscript') 
    9998if env['OPENAL_SUPPORT']: 
    10099    avango.build.SConscript('avango-openal/SConscript') 
     100avango.build.SConscript('avango-tools/SConscript')     
    101101avango.build.SConscript('avango-inspector/SConscript') 
    102102avango.build.SConscript('avango-doc/SConscript') 

  • trunk/avango-build/src/avango/build/recipes.py

    r11 r13  
    9696        # xerces 
    9797        _config_store.set('xerces', PlainConfig(libraries = ['xerces-c_2'])) 
     98        # avango Python libs 
     99        _config_store.set('avango-python-script', PlainConfig(libraries = ['_script'])) 
    98100 
    99101def set_config_flag(key, value): 

  • trunk/avango-osg/src/avango/osg/viewer/GraphicsWindow.cpp

    r1 r13  
    3838#endif 
    3939 
     40#else 
     41#include <osgViewer/api/Win32/GraphicsWindowWin32> 
     42#include <osgViewer/api/Win32/PixelBufferWin32> 
    4043#endif // !_WIN32 
    4144 
    … …  
    597600    dynamic_cast< ::osgViewer::GraphicsWindowX11*>(mOsgGraphicsWindow.get())-> 
    598601      ::osgViewer::GraphicsWindowX11::checkEvents(); 
     602#else 
     603    ::osgViewer::GraphicsWindowWin32 *window =  
     604       dynamic_cast< ::osgViewer::GraphicsWindowWin32*>(mOsgGraphicsWindow.get()); 
     605 
     606    if (window) 
     607    { 
     608      window->::osgViewer::GraphicsWindowWin32::checkEvents(); 
     609    } 
     610    else 
     611    { 
     612       logger.error() << "evaluateLocalSideEffect(): checking events failed"; 
     613    } 
    599614#endif 
     615 
    600616  } 
    601617} 

  • trunk/avango-python/SConscript

    r1 r13  
    2828avango.build.Environment.prepend_include_path(Dir('include').abspath) 
    2929avango.build.Environment.prepend_python_path(Dir('src/test_package').abspath) 
     30avango.build.Environment.prepend_library_path(Dir('src/avango').abspath) 
     31avango.build.Environment.prepend_library_path(Dir('src/avango/script').abspath) 
    3032avango_env = avango.build.PythonEnvironment() 
     33avango_env.Append(CPPDEFINES='AV_PYTHON_LIBRARY') 
    3134avango.build.add_library(avango_env, 'boost_python') 
    3235avango.build.add_library(avango_env, 'avango-core') 

  • trunk/avango-python/include/avango/python/SConscript

    r1 r13  
    3030                register_field.h 
    3131                exceptions.h 
     32                windows_specific_python.h 
    3233                ''') 
    3334 

  • trunk/avango-python/include/avango/python/script/Types.h

    r1 r13  
    4646#include <avango/InputStream.h> 
    4747#include <avango/OutputStream.h> 
     48#include <avango/python/windows_specific_python.h> 
    4849 
    4950namespace av 
    … …  
    5960#endif 
    6061 
    61   InputStream& operator>>(InputStream&, boost::python::api::object&); 
    62   OutputStream& operator<<(OutputStream&, const boost::python::api::object&); 
     62  AV_PYTHON_DLL InputStream& operator>>(InputStream&, boost::python::api::object&); 
     63  AV_PYTHON_DLL OutputStream& operator<<(OutputStream&, const boost::python::api::object&); 
    6364 
    6465  namespace script 
    … …  
    6768    typedef MultiField<boost::python::object> MFObject; 
    6869  } 
     70 
     71#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     72  template class AV_PYTHON_DLL SingleField<boost::python::object>; 
     73  template class AV_PYTHON_DLL MultiField<boost::python::object>; 
     74#endif 
     75 
    6976} // namespace av 
    7077 

  • trunk/avango-tools/include/avango/tools/ChangeSelector.h

    r1 r13  
    3333 
    3434#include <avango/tools/Selector.h> 
     35#include "windows_specific_tools.h" 
    3536 
    3637namespace av 
    … …  
    4445     * \ingroup av_tools 
    4546     */ 
    46     class ChangeSelector : public Selector 
     47    class AV_TOOLS_DLL ChangeSelector : public Selector 
    4748    { 
    4849      AV_FC_DECLARE(); 
    … …  
    9091    typedef MultiField<Link<ChangeSelector> > MFChangeSelector; 
    9192  } 
     93 
     94#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     95  template class AV_TOOLS_DLL SingleField<Link<tools::ChangeSelector> >; 
     96  template class AV_TOOLS_DLL MultiField<Link<tools::ChangeSelector> >; 
     97#endif 
     98 
    9299} 
    93100 

  • trunk/avango-tools/include/avango/tools/DragTool.h

    r1 r13  
    3333 
    3434#include <avango/tools/Tool.h> 
    35  
    3635#include <avango/osg/Fields.h> 
     36#include "windows_specific_tools.h" 
    3737 
    3838namespace av 
    … …  
    4545     * \ingroup av_tools 
    4646     */ 
    47     class DragTool : public Tool 
     47    class AV_TOOLS_DLL DragTool : public Tool 
    4848    { 
    4949      AV_FC_DECLARE(); 
    … …  
    8383    typedef MultiField<Link<DragTool> > MFDragTool; 
    8484  } 
     85 
     86#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     87  template class AV_TOOLS_DLL SingleField<Link<tools::DragTool> >; 
     88  template class AV_TOOLS_DLL MultiField<Link<tools::DragTool> >; 
     89#endif 
     90 
    8591} 
    8692 

  • trunk/avango-tools/include/avango/tools/Init.h

    r1 r13  
    3333 
    3434#include <avango/Typed.h> 
     35#include "windows_specific_tools.h" 
    3536 
    3637namespace av 
    … …  
    4445     * \ingroup av_tools 
    4546     */ 
    46     class Init 
     47    class AV_TOOLS_DLL Init 
    4748    { 
    4849      AV_TYPED_DECLARE_ABSTRACT(); 

  • trunk/avango-tools/include/avango/tools/InjectSelector.h

    r1 r13  
    3333 
    3434#include <avango/tools/Selector.h> 
     35#include "windows_specific_tools.h" 
    3536 
    3637namespace av 
    … …  
    4445     * \ingroup av_tools 
    4546     */ 
    46     class InjectSelector : public Selector 
     47    class AV_TOOLS_DLL InjectSelector : public Selector 
    4748    { 
    4849      AV_FC_DECLARE(); 
    … …  
    8182    typedef MultiField<Link<InjectSelector> > MFInjectSelector; 
    8283  } 
     84 
     85#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     86  template class AV_TOOLS_DLL SingleField<Link<tools::InjectSelector> >; 
     87  template class AV_TOOLS_DLL MultiField<Link<tools::InjectSelector> >; 
     88#endif 
     89 
    8390} 
    8491 

  • trunk/avango-tools/include/avango/tools/IntersectionTargetHolder.h

    r1 r13  
    3333 
    3434#include <avango/tools/NodePathTargetHolder.h> 
    35  
    3635#include <avango/osg/Intersection.h> 
     36#include "windows_specific_tools.h" 
    3737 
    3838 
    … …  
    4949     * \ingroup av_tools 
    5050     */ 
    51     class IntersectionTargetHolder : public NodePathTargetHolder 
     51    class AV_TOOLS_DLL IntersectionTargetHolder : public NodePathTargetHolder 
    5252    { 
    5353      AV_FC_DECLARE(); 
    … …  
    7979    typedef MultiField<Link<IntersectionTargetHolder> > MFIntersectionTargetHolder; 
    8080  } 
     81 
     82#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     83  template class AV_TOOLS_DLL SingleField<Link<tools::IntersectionTargetHolder> >; 
     84  template class AV_TOOLS_DLL MultiField<Link<tools::IntersectionTargetHolder> >; 
     85#endif 
     86 
    8187} 
    8288 

  • trunk/avango-tools/include/avango/tools/NameSelector.h

    r1 r13  
    3333 
    3434#include <avango/tools/Selector.h> 
     35#include "windows_specific_tools.h" 
    3536 
    3637namespace av 
    … …  
    4344     * \ingroup av_tools 
    4445     */ 
    45     class NameSelector : public Selector 
     46    class AV_TOOLS_DLL NameSelector : public Selector 
    4647    { 
    4748      AV_FC_DECLARE(); 
    … …  
    109110    typedef MultiField<Link<NameSelector> > MFNameSelector; 
    110111  } 
     112 
     113#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     114  template class AV_TOOLS_DLL SingleField<Link<tools::NameSelector> >; 
     115  template class AV_TOOLS_DLL MultiField<Link<tools::NameSelector> >; 
     116#endif 
     117 
    111118} 
    112119 

  • trunk/avango-tools/include/avango/tools/NodePathTargetHolder.h

    r1 r13  
    3333 
    3434#include <avango/tools/TargetHolder.h> 
    35  
    3635#include <avango/osg/Node.h> 
     36#include "windows_specific_tools.h" 
    3737 
    3838 
    … …  
    4949     * \ingroup av_tools 
    5050     */ 
    51     class NodePathTargetHolder : public TargetHolder 
     51    class AV_TOOLS_DLL NodePathTargetHolder : public TargetHolder 
    5252    { 
    5353      AV_FC_DECLARE(); 
    … …  
    7979    typedef MultiField<Link<NodePathTargetHolder> > MFNodePathTargetHolder; 
    8080  } 
     81 
     82#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     83  template class AV_TOOLS_DLL SingleField<Link<tools::NodePathTargetHolder> >; 
     84  template class AV_TOOLS_DLL MultiField<Link<tools::NodePathTargetHolder> >; 
     85#endif 
     86 
    8187} 
    8288 

  • trunk/avango-tools/include/avango/tools/ObjectSelector.h

    r1 r13  
    3333 
    3434#include <avango/tools/Selector.h> 
     35#include "windows_specific_tools.h" 
     36 
    3537 
    3638namespace av 
    … …  
    4345     * \ingroup av_tools 
    4446     */ 
    45     class ObjectSelector : public Selector 
     47    class AV_TOOLS_DLL ObjectSelector : public Selector 
    4648    { 
    4749      AV_FC_DECLARE(); 
    … …  
    9698    typedef MultiField<Link<ObjectSelector> > MFObjectSelector; 
    9799  } 
     100 
     101#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     102  template class AV_TOOLS_DLL SingleField<Link<tools::ObjectSelector> >; 
     103  template class AV_TOOLS_DLL MultiField<Link<tools::ObjectSelector> >; 
     104#endif 
     105 
    98106} 
    99107 

  • trunk/avango-tools/include/avango/tools/PickSelector.h

    r1 r13  
    4040#include <osgUtil/LineSegmentIntersector> 
    4141 
     42#include "windows_specific_tools.h" 
    4243 
    4344namespace av 
    … …  
    6263     * \ingroup av_tools 
    6364     */ 
    64     class PickSelector : public Selector 
     65    class AV_TOOLS_DLL PickSelector : public Selector 
    6566    { 
    6667      AV_FC_DECLARE(); 
    … …  
    174175    typedef MultiField<Link<PickSelector> > MFPickSelector; 
    175176  } 
     177 
     178#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     179  template class AV_TOOLS_DLL SingleField<Link<tools::PickSelector> >; 
     180  template class AV_TOOLS_DLL MultiField<Link<tools::PickSelector> >; 
     181#endif 
     182 
    176183} 
    177184 

  • trunk/avango-tools/include/avango/tools/ProximitySelector.h

    r1 r13  
    3737#include <avango/osg/Node.h> 
    3838 
     39#include "windows_specific_tools.h" 
     40 
    3941namespace av 
    4042{ 
    … …  
    4749     * \ingroup av_tools 
    4850     */ 
    49     class ProximitySelector : public Selector 
     51    class AV_TOOLS_DLL ProximitySelector : public Selector 
    5052    { 
    5153      AV_FC_DECLARE(); 
    … …  
    146148    typedef MultiField<Link<ProximitySelector> > MFProximitySelector; 
    147149  } 
     150 
     151#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     152  template class AV_TOOLS_DLL SingleField<Link<tools::ProximitySelector> >; 
     153  template class AV_TOOLS_DLL MultiField<Link<tools::ProximitySelector> >; 
     154#endif 
     155 
    148156} 
    149157 

  • trunk/avango-tools/include/avango/tools/SConscript

    r1 r13  
    3939    TypeSelector.h 
    4040    UnionSelector.h 
     41    windows_specific_tools.h 
    4142    ''') 
    4243 

  • trunk/avango-tools/include/avango/tools/ScaledGrabTool.h

    r1 r13  
    3333 
    3434#include <avango/tools/Tool.h> 
    35  
    3635#include <avango/osg/Fields.h> 
     36#include "windows_specific_tools.h" 
    3737 
    3838namespace av 
    … …  
    4545     * \ingroup av_tools 
    4646     */ 
    47     class ScaledGrabTool : public Tool 
     47    class AV_TOOLS_DLL ScaledGrabTool : public Tool 
    4848    { 
    4949      AV_FC_DECLARE(); 
    … …  
    9090    typedef MultiField<Link<ScaledGrabTool> > MFScaledGrabTool; 
    9191  } 
     92 
     93#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     94  template class AV_TOOLS_DLL SingleField<Link<tools::ScaledGrabTool> >; 
     95  template class AV_TOOLS_DLL MultiField<Link<tools::ScaledGrabTool> >; 
     96#endif 
     97 
    9298} 
    9399 

  • trunk/avango-tools/include/avango/tools/Selector.h

    r1 r13  
    3333 
    3434#include <avango/Object.h> 
    35  
    3635#include <avango/tools/TargetHolder.h> 
     36#include "windows_specific_tools.h" 
    3737 
    3838namespace av 
    … …  
    4545     * \ingroup av_tools 
    4646     */ 
    47     class Selector : public av::Object 
     47    class AV_TOOLS_DLL Selector : public av::Object 
    4848    { 
    4949      AV_FC_DECLARE_ABSTRACT(); 
    … …  
    7676    typedef MultiField<Link<Selector> > MFSelector; 
    7777  } 
     78 
     79#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     80  template class AV_TOOLS_DLL SingleField<Link<tools::Selector> >; 
     81  template class AV_TOOLS_DLL MultiField<Link<tools::Selector> >; 
     82#endif 
     83 
    7884} 
    7985 

  • trunk/avango-tools/include/avango/tools/SingleSelector.h

    r1 r13  
    3333 
    3434#include <avango/tools/Selector.h> 
     35#include "windows_specific_tools.h" 
    3536 
    3637namespace av 
    … …  
    4344     * \ingroup av_tools 
    4445     */ 
    45     class SingleSelector : public Selector 
     46    class AV_TOOLS_DLL SingleSelector : public Selector 
    4647    { 
    4748      AV_FC_DECLARE(); 
    … …  
    8081    typedef MultiField<Link<SingleSelector> > MFSingleSelector; 
    8182  } 
     83 
     84#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     85  template class AV_TOOLS_DLL SingleField<Link<tools::SingleSelector> >; 
     86  template class AV_TOOLS_DLL MultiField<Link<tools::SingleSelector> >; 
     87#endif 
     88 
    8289} 
    8390 

  • trunk/avango-tools/include/avango/tools/TargetHolder.h

    r1 r13  
    3333 
    3434#include <avango/Object.h> 
     35#include <avango/tools/Config.h> 
     36#include "windows_specific_tools.h" 
    3537 
    36 #include <avango/tools/Config.h> 
    3738 
    3839namespace av 
    … …  
    5253     * \ingroup av_tools 
    5354     */ 
    54     class TargetHolder : public av::Object 
     55    class AV_TOOLS_DLL TargetHolder : public av::Object 
    5556    { 
    5657      AV_FC_DECLARE(); 
    … …  
    157158    } 
    158159  } 
     160 
     161#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     162  template class AV_TOOLS_DLL SingleField<Link<tools::TargetHolder> >; 
     163  template class AV_TOOLS_DLL MultiField<Link<tools::TargetHolder> >; 
     164#endif 
     165 
    159166} 
    160167 

  • trunk/avango-tools/include/avango/tools/Tool.h

    r1 r13  
    3333 
    3434#include <avango/Object.h> 
     35#include <avango/tools/TargetHolder.h> 
     36#include "windows_specific_tools.h" 
    3537 
    36 #include <avango/tools/TargetHolder.h> 
    3738 
    3839namespace av 
    … …  
    4546     * \ingroup av_tools 
    4647     */ 
    47     class Tool : public av::Object 
     48    class AV_TOOLS_DLL Tool : public av::Object 
    4849    { 
    4950      AV_FC_DECLARE_ABSTRACT(); 
    … …  
    102103    typedef MultiField<Link<Tool> > MFTool; 
    103104  } 
     105 
     106#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     107  template class AV_TOOLS_DLL SingleField<Link<tools::Tool> >; 
     108  template class AV_TOOLS_DLL MultiField<Link<tools::Tool> >; 
     109#endif 
     110 
    104111} 
    105112 

  • trunk/avango-tools/include/avango/tools/TriggerSelector.h

    r1 r13  
    3333 
    3434#include <avango/tools/Selector.h> 
     35#include "windows_specific_tools.h" 
     36 
    3537 
    3638namespace av 
    … …  
    4345     * \ingroup av_tools 
    4446     */ 
    45     class TriggerSelector : public Selector 
     47    class AV_TOOLS_DLL TriggerSelector : public Selector 
    4648    { 
    4749      AV_FC_DECLARE(); 
    … …  
    8991    typedef MultiField<Link<TriggerSelector> > MFTriggerSelector; 
    9092  } 
     93 
     94#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     95  template class AV_TOOLS_DLL SingleField<Link<tools::TriggerSelector> >; 
     96  template class AV_TOOLS_DLL MultiField<Link<tools::TriggerSelector> >; 
     97#endif 
     98 
    9199} 
    92100 

  • trunk/avango-tools/include/avango/tools/TypeSelector.h

    r1 r13  
    3333 
    3434#include <avango/tools/Selector.h> 
     35#include "windows_specific_tools.h" 
     36 
    3537 
    3638namespace av 
    … …  
    4345     * \ingroup av_tools 
    4446     */ 
    45     class TypeSelector : public Selector 
     47    class AV_TOOLS_DLL TypeSelector : public Selector 
    4648    { 
    4749      AV_FC_DECLARE(); 
    … …  
    109111    typedef MultiField<Link<TypeSelector> > MFTypeSelector; 
    110112  } 
     113 
     114#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     115  template class AV_TOOLS_DLL SingleField<Link<tools::TypeSelector> >; 
     116  template class AV_TOOLS_DLL MultiField<Link<tools::TypeSelector> >; 
     117#endif 
    111118} 
    112119 

  • trunk/avango-tools/include/avango/tools/UnionSelector.h

    r1 r13  
    3333 
    3434#include <avango/tools/Selector.h> 
     35#include "windows_specific_tools.h" 
     36 
    3537 
    3638namespace av 
    … …  
    4345     * \ingroup av_tools 
    4446     */ 
    45     class UnionSelector : public Selector 
     47    class AV_TOOLS_DLL UnionSelector : public Selector 
    4648    { 
    4749      AV_FC_DECLARE(); 
    … …  
    7678    typedef MultiField<Link<UnionSelector> > MFUnionSelector; 
    7779  } 
     80 
     81#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     82  template class AV_TOOLS_DLL SingleField<Link<tools::UnionSelector> >; 
     83  template class AV_TOOLS_DLL MultiField<Link<tools::UnionSelector> >; 
     84#endif 
     85 
    7886} 
    7987 

  • trunk/avango-tools/python/SConscript

    r1 r13  
    2929module_env = avango.build.PythonEnvironment() 
    3030avango.build.add_library(module_env, 'boost_python') 
     31avango.build.add_library(module_env, 'avango-core') 
     32avango.build.add_library(module_env, 'avango-python') 
     33avango.build.add_library(module_env, 'avango-python-script') 
    3134module_env.Prepend(LIBS="avangoTools") 
    3235 

  • trunk/avango-tools/python/avango/tools/ScriptTool.h

    r1 r13  
    8282    typedef MultiField<Link<ScriptTool> > MFScriptTool; 
    8383  } 
     84 
     85#ifdef AV_INSTANTIATE_FIELD_TEMPLATES 
     86  template class SingleField<Link<tools::ScriptTool> >; 
     87  template class MultiField<Link<tools::ScriptTool> >; 
     88#endif 
     89 
    8490} 
    8591 

  • trunk/avango-tools/src/avango/tools/SConscript

    r1 r13  
    2727Import('tools_env') 
    2828 
     29tools_env.Append(CPPDEFINES='AV_TOOLS_LIBRARY') 
     30 
    2931sources = Split(''' 
    3032    ChangeSelector.cpp 
    … …  
    4446if avango.build.Environment()['OPENSCENEGRAPH_SUPPORT']: 
    4547    avango.build.add_library(tools_env, 'avango-osg') 
     48    avango.build.add_library(tools_env, 'avango-core') 
     49    avango.build.add_library(tools_env, 'osg') 
     50    avango.build.add_library(tools_env, 'osgUtil') 
    4651    sources += Split(''' 
    4752        DragTool.cpp 
Note: See TracChangeset for help on using the changeset viewer.