Merge remote-tracking branch 'origin/master' into gsoc2012-interactions 63/12663/1
Vincent COUVERT [Wed, 25 Sep 2013 14:59:51 +0000 (16:59 +0200)]
Conflicts:
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/includes/graphicObjectProperties.h
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObject.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/io/macros/%_save.sci
scilab/modules/io/macros/%_sodload.sci
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/interaction/DragZoomRotateInteraction.java

Change-Id: Ic0e8e9c291f0c71e144f4c9c60ef2f0293b8a374

24 files changed:
1  2 
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/includes/graphicObjectProperties.h
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicModel/GraphicModel.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObject.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/io/macros/%_save.sci
scilab/modules/io/macros/%_sodload.sci
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/AxesDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/interaction/DragZoomRotateInteraction.java

@@@ -73,10 -70,10 +73,11 @@@ GRAPHIC_OBJECTS_CXX_SOURCES =      src/cpp/
                                                                src/cpp/CurrentFigure.cpp \
                                                                src/cpp/CurrentObject.cpp \
                                                                src/cpp/CurrentSubwin.cpp \
 +                                                              src/cpp/createObjectData.cpp \
 +                                                              src/cpp/pickSurface.cpp \
-                                                               src/cpp/Texture.cpp
+                                                               src/cpp/Texture.cpp \
+                                                               src/cpp/NormalGenerator.cpp
  
 -
  GIWS_WRAPPERS = src/jni/graphic_objects.giws.xml
  
  if GIWS
@@@ -223,9 -220,8 +223,10 @@@ am__objects_4 = libscigraphic_objects_l
        libscigraphic_objects_la-CurrentFigure.lo \
        libscigraphic_objects_la-CurrentObject.lo \
        libscigraphic_objects_la-CurrentSubwin.lo \
 +      libscigraphic_objects_la-createObjectData.lo \
 +      libscigraphic_objects_la-pickSurface.lo \
-       libscigraphic_objects_la-Texture.lo
+       libscigraphic_objects_la-Texture.lo \
+       libscigraphic_objects_la-NormalGenerator.lo
  am_libscigraphic_objects_la_OBJECTS = $(am__objects_2) \
        $(am__objects_3) $(am__objects_4)
  libscigraphic_objects_la_OBJECTS =  \
@@@ -720,9 -713,8 +721,10 @@@ GRAPHIC_OBJECTS_CXX_SOURCES = src/cpp/c
                                                                src/cpp/CurrentFigure.cpp \
                                                                src/cpp/CurrentObject.cpp \
                                                                src/cpp/CurrentSubwin.cpp \
 +                                                              src/cpp/createObjectData.cpp \
 +                                                              src/cpp/pickSurface.cpp \
-                                                               src/cpp/Texture.cpp
+                                                               src/cpp/Texture.cpp \
+                                                               src/cpp/NormalGenerator.cpp
  
  GIWS_WRAPPERS = src/jni/graphic_objects.giws.xml
  libscigraphic_objects_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
@@@ -877,9 -867,8 +879,10 @@@ distclean-compile
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotData.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotDataDecomposer.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonPolylineData.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NormalGenerator.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-ObjectData_wrap.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-Plot3DDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-PolylineData_wrap.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-PolylineDecomposer.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-ScilabNativeView_wrap.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-ScilabView.Plo@am__quote@
index 98e6aba,40d9e0f..9425f46
mode 100755,100644..100755
  #define __GO_PROGRESSIONBAR__ 300
  #define __GO_UI_MESSAGE__ 301
  #define __GO_UI_MESSAGE_SIZE__ 302
 -#define __GO_AMBIENTCOLOR__ 303
 -#define __GO_DIFFUSECOLOR__ 304
 -#define __GO_SPECULARCOLOR__ 305
 -#define __GO_COLOR_MATERIAL__ 306
 -#define __GO_MATERIAL_SHININESS__ 307
 -#define __GO_LIGHT__ 308
 -#define __GO_LIGHT_TYPE__ 309
 +#define __GO_DATATIP__ 303
 +#define __GO_DATATIP_DATA__ 304
 +#define __GO_DATATIP_ORIENTATION__ 305
 +#define __GO_DATATIP_3COMPONENT__ 306
 +#define __GO_DATATIP_AUTOORIENTATION__ 307
 +#define __GO_DATATIP_INTERP_MODE__ 308
 +#define __GO_DATATIP_DISPLAY_FNC__ 309
 +#define __GO_DATATIP_BOX_MODE__ 310
 +#define __GO_DATATIP_LABEL_MODE__ 311
++#define __GO_AMBIENTCOLOR__ 312
++#define __GO_DIFFUSECOLOR__ 313
++#define __GO_SPECULARCOLOR__ 314
++#define __GO_COLOR_MATERIAL__ 315
++#define __GO_MATERIAL_SHININESS__ 316
++#define __GO_LIGHT__ 317
++#define __GO_LIGHT_TYPE__ 318
  
  #endif /* !__GRAPHIC_OBJECT_PROPERTIES_H__ */
      <None Include="..\jni\ScilabNativeView.i">
        <Filter>Swig Files</Filter>
      </None>
 +    <None Include="..\jni\PolylineData.i">
 +      <Filter>Swig Files</Filter>
 +    </None>
 +    <None Include="..\jni\SurfaceData.i">
 +      <Filter>Swig Files</Filter>
 +    </None>
 +    <None Include="..\jni\ObjectData.i">
 +      <Filter>Swig Files</Filter>
 +    </None>
    </ItemGroup>
- </Project>
+ </Project>
@@@ -45,7 -45,7 +45,7 @@@ public abstract class GraphicObject imp
      public enum Type { ARC, AXES, AXESMODEL, AXIS, CHAMP, COMPOUND, FAC3D, FEC, FIGURE, FIGUREMODEL, GRAYPLOT,
                         LABEL, LEGEND, MATPLOT, PLOT3D, POLYLINE, RECTANGLE, SEGS, TEXT, CHECKBOX, EDIT, FRAME,
                         IMAGE, LISTBOX, POPUPMENU, PUSHBUTTON, RADIOBUTTON, CONSOLE, JAVACONSOLE, SLIDER, TABLE, UITEXT, UIMENU, UIMENUMODEL,
-                        PROGRESSIONBAR, WAITBAR, UICONTEXTMENU, DATATIP, UNKNOWNOBJECT
 -                       PROGRESSIONBAR, WAITBAR, UICONTEXTMENU, LIGHT, UNKNOWNOBJECT
++                       PROGRESSIONBAR, WAITBAR, UICONTEXTMENU, DATATIP, LIGHT, UNKNOWNOBJECT
                       };
  
      /** GraphicObject properties */
                  return Type.PROGRESSIONBAR;
              case __GO_WAITBAR__ :
                  return Type.WAITBAR;
 +            case __GO_DATATIP__:
 +                return Type.DATATIP;
+             case __GO_LIGHT__ :
+                 return Type.LIGHT;
              default :
                  return Type.UNKNOWNOBJECT;
          }
index 19feef3,cb465db..86ea0a1
mode 100755,100644..100755
@@@ -323,14 -323,12 +323,21 @@@ public class GraphicObjectProperties 
      public static final int __GO_PROGRESSIONBAR__ = 300;
      public static final int __GO_UI_MESSAGE__ = 301;
      public static final int __GO_UI_MESSAGE_SIZE__ = 302;
 -    public static final int __GO_AMBIENTCOLOR__ = 303;
 -    public static final int __GO_DIFFUSECOLOR__ = 304;
 -    public static final int __GO_SPECULARCOLOR__ = 305;
 -    public static final int __GO_COLOR_MATERIAL__ = 306;
 -    public static final int __GO_MATERIAL_SHININESS__ = 307;
 -    public static final int __GO_LIGHT__ = 308;
 -    public static final int __GO_LIGHT_TYPE__ = 309;
 +    public static final int __GO_DATATIP__ = 303;
 +    public static final int __GO_DATATIP_DATA__ = 304;
 +    public static final int __GO_DATATIP_ORIENTATION__ = 305;
 +    public static final int __GO_DATATIP_3COMPONENT__ = 306;
 +    public static final int __GO_DATATIP_AUTOORIENTATION__ = 307;
 +    public static final int __GO_DATATIP_INTERP_MODE__ = 308;
 +    public static final int __GO_DATATIP_DISPLAY_FNC__ = 309;
 +    public static final int __GO_DATATIP_BOX_MODE__ = 310;
 +    public static final int __GO_DATATIP_LABEL_MODE__ = 311;
++    public static final int __GO_AMBIENTCOLOR__ = 312;
++    public static final int __GO_DIFFUSECOLOR__ = 313;
++    public static final int __GO_SPECULARCOLOR__ = 314;
++    public static final int __GO_COLOR_MATERIAL__ = 315;
++    public static final int __GO_MATERIAL_SHININESS__ = 316;
++    public static final int __GO_LIGHT__ = 317;
++    public static final int __GO_LIGHT_TYPE__ = 318;
  
  }
index 85e75bb,fbfd067..e2acf00
mode 100755,100644..100755
@@@ -341,12 -341,12 +341,22 @@@ __GO_PROGRESSIONBAR_
  __GO_UI_MESSAGE__
  __GO_UI_MESSAGE_SIZE__
  
 +__GO_DATATIP__
 +__GO_DATATIP_DATA__
 +__GO_DATATIP_ORIENTATION__
 +__GO_DATATIP_3COMPONENT__
 +__GO_DATATIP_AUTOORIENTATION__
 +__GO_DATATIP_INTERP_MODE__
 +__GO_DATATIP_DISPLAY_FNC__
 +__GO_DATATIP_BOX_MODE__
 +__GO_DATATIP_LABEL_MODE__
++
+ __GO_AMBIENTCOLOR__
+ __GO_DIFFUSECOLOR__
+ __GO_SPECULARCOLOR__
+ __GO_COLOR_MATERIAL__
+ __GO_MATERIAL_SHININESS__
+ __GO_LIGHT__
+ __GO_LIGHT_TYPE__
Simple merge
@@@ -1590,9 -1619,10 +1623,11 @@@ distclean-compile
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_data_bounds_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_data_mapping_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_data_property.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_datatip_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_default_axes_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_default_figure_property.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_diffuse_color_property.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_direction_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_event_handler_enable_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_event_handler_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_figure_closerequestfcn_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_data_bounds_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_data_mapping_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_data_property.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_datatip_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_default_values_property.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_diffuse_color_property.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_direction_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_event_handler_enable_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_event_handler_property.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_figure_closerequestfcn_property.Plo@am__quote@
@@@ -251,9 -253,10 +253,11 @@@ lib /DEF:"$(ProjectDir)elementary_funct
      <ClCompile Include="src\c\getHandleProperty\get_data_bounds_property.c" />
      <ClCompile Include="src\c\getHandleProperty\get_data_mapping_property.c" />
      <ClCompile Include="src\c\getHandleProperty\get_data_property.c" />
 +    <ClCompile Include="src\c\getHandleProperty\get_datatip_property.c" />
      <ClCompile Include="src\c\getHandleProperty\get_default_axes_property.c" />
      <ClCompile Include="src\c\getHandleProperty\get_default_figure_property.c" />
+     <ClCompile Include="src\c\getHandleProperty\get_diffuse_color_property.c" />
+     <ClCompile Include="src\c\getHandleProperty\get_direction_property.c" />
      <ClCompile Include="src\c\getHandleProperty\get_event_handler_enable_property.c" />
      <ClCompile Include="src\c\getHandleProperty\get_event_handler_property.c" />
      <ClCompile Include="src\c\getHandleProperty\get_figure_closerequestfcn_property.c" />
index fcb2291,a065469..277c841
mode 100755,100644..100755
@@@ -46,7 -46,7 +46,7 @@@ typedef struc
   * don't forget to modify it each time the propertyTable
   * is modified.
   */
- #define NB_PROPERTIES 171
 -#define NB_PROPERTIES 170
++#define NB_PROPERTIES 178
  
  /**
   * list of all property names and associated functions in scilab
@@@ -216,14 -216,13 +216,21 @@@ static getHashTableCouple propertyTable
      {"resizefcn", get_figure_resizefcn_property},
      {"tooltipstring", GetUicontrolTooltipString},
      {"closerequestfcn", get_figure_closerequestfcn_property},
 +    {"tip_data", get_tip_data_property},
 +    {"tip_orientation", get_tip_orientation_property},
 +    {"tip_3component", get_tip_3component_property},
 +    {"tip_auto_orientation", get_tip_auto_orientation_property},
 +    {"tip_interp_mode", get_tip_interp_mode_property},
 +    {"tip_box_mode", get_tip_box_mode_property},
 +    {"tip_label_mode", get_tip_label_mode_property},
 +    {"tip_disp_function", get_tip_disp_function_property},
+     {"ambient_color", get_ambient_color_property},
+     {"diffuse_color", get_diffuse_color_property},
+     {"specular_color", get_specular_color_property},
+     {"use_color_material", get_use_color_material_property},
+     {"material_shininess", get_material_shininess_property},
+     {"light_type", get_light_type_property},
+     {"direction", get_direction_property},
      {"image_type", get_image_type_property}
  };
  
index 3c5ad0c,50df655..097bb78
mode 100755,100644..100755
@@@ -52,7 -52,7 +52,7 @@@ typedef struc
  * don't forget to modify it each time the propertyTable
  * is modified.
  */
- #define NB_PROPERTIES 166
 -#define NB_PROPERTIES 165
++#define NB_PROPERTIES 173
  
  /**
  * list of all property names and associated functions in scilab
@@@ -217,14 -217,13 +217,21 @@@ static setHashTableCouple propertyTable
      {"resizefcn", set_figure_resizefcn_property},
      {"tooltipstring", SetUicontrolTooltipString},
      {"closerequestfcn", set_figure_closerequestfcn_property},
 +    {"tip_data", set_tip_data_property},
 +    {"tip_orientation", set_tip_orientation_property},
 +    {"tip_3component", set_tip_3component_property},
 +    {"tip_auto_orientation", set_tip_auto_orientation_property},
 +    {"tip_interp_mode", set_tip_interp_mode_property},
 +    {"tip_box_mode", set_tip_box_mode_property},
 +    {"tip_label_mode", set_tip_label_mode_property},
 +    {"tip_disp_function", set_tip_disp_function_property},
+     {"ambient_color", set_ambient_color_property},
+     {"diffuse_color", set_diffuse_color_property},
+     {"specular_color", set_specular_color_property},
+     {"use_color_material", set_use_color_material_property},
+     {"material_shininess", set_material_shininess_property},
+     {"light_type", set_light_type_property},
+     {"direction", set_direction_property},
      {"image_type", set_image_type_property}
  };
  
index ed31f3c,ef2d113..7eb7760
mode 100755,100644..100755
@@@ -180,14 -180,13 +180,21 @@@ int get_grid_position_property(void* _p
  int get_anti_aliasing_property(void* _pvCtx, char* pobjUID);
  int get_tag_property(void* _pvCtx, char* pobjUID);
  int get_UID(void* _pvCtx, char *pobjUID);
 +int get_tip_data_property(void* _pvCtx, char *pobjUID);
 +int get_tip_orientation_property(void* _pvCtx, char *pobjUID);
 +int get_tip_3component_property(void* _pvCtx, char *pobjUID);
 +int get_tip_auto_orientation_property(void* _pvCtx, char* pobjUID);
 +int get_tip_interp_mode_property(void* _pvCtx, char* pobjUID);
 +int get_tip_box_mode_property(void* _pvCtx, char* pobjUID);
 +int get_tip_label_mode_property(void* _pvCtx, char* pobjUID);
 +int get_tip_disp_function_property(void* _pvCtx, char* pobjUID);
+ int get_ambient_color_property(void* _pvCtx, char* pobjUID);
+ int get_diffuse_color_property(void* _pvCtx, char* pobjUID);
+ int get_specular_color_property(void* _pvCtx, char* pobjUID);
+ int get_use_color_material_property(void* _pvCtx, char* pobjUID);
+ int get_material_shininess_property(void* _pvCtx, char* pobjUID);
+ int get_light_type_property(void* _pvCtx, char* pobjUID);
+ int get_direction_property(void* _pvCtx, char* pobjUID);
  int get_image_type_property(void* _pvCtx, char* pobjUID);
  int get_video_mode_property(void* _pvCtx, char* pobjUID);
  
@@@ -80,8 -80,8 +80,10 @@@ static char *getTypeNameFromInt(int _iT
              return "ShowHiddenHandles";
          case __GO_WAITBAR__ :
              return "Waitbar";
 +        case __GO_DATATIP__:
 +            return "Datatip";
+         case __GO_LIGHT__ :
+             return "Light";
          default :
              return "????";
      }
index 5909652,f080c3c..af8fb43
mode 100755,100644..100755
@@@ -181,14 -180,13 +181,21 @@@ int set_color_range_property(void* _pvC
  int set_grid_position_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
  int set_anti_aliasing_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
  int set_tag_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
 +int set_tip_data_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
 +int set_tip_orientation_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
 +int set_tip_3component_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
 +int set_tip_auto_orientation_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
 +int set_tip_interp_mode_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
 +int set_tip_box_mode_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
 +int set_tip_label_mode_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
 +int set_tip_disp_function_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
+ int set_ambient_color_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
+ int set_diffuse_color_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
+ int set_specular_color_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
+ int set_use_color_material_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
+ int set_material_shininess_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
+ int set_light_type_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
+ int set_direction_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
  int set_image_type_property(void* _pvCtx, char* pobjUID, void* _pvData, int valueType, int nbRow, int nbCol);
  int set_video_mode_property(void* _pvCtx, char* pobjUID, void* _pvData, int valueType, int nbRow, int nbCol);
  
@@@ -149,8 -149,8 +149,10 @@@ function [] = %_save(%__filename__, var
              item = extractuicontextmenu(h);
          case "uicontrol"
              item = extractuicontrol(h);
 +        case "Datatip"
 +            item = extractDatatip(h);
+         case "Light"
+             item = extractLight(h);
          else
              error("handle of type " + h.type + " unhandled");
              item = [];
@@@ -131,8 -131,8 +131,10 @@@ function %_sodload(%__filename__, varar
              h = createuicontextmenu(item);
          case "uicontrol"
              h = createuicontrol(item);
 +        case "Datatip"
 +            h = createDatatip(item);
+         case "Light"
+             h = createLight(item);
          else
              error("handle of type " + item.type + " unhandled");
              h = [];
index 7331277,63c53ad..eec408a
mode 100755,100644..100755
@@@ -66,8 -64,9 +66,9 @@@ import org.scilab.modules.renderer.JoGL
  import org.scilab.modules.renderer.JoGLView.util.ColorFactory;
  import org.scilab.modules.renderer.JoGLView.util.OutOfMemoryException;
  import org.scilab.modules.renderer.utils.textRendering.FontManager;
 +import org.scilab.modules.renderer.JoGLView.datatip.DatatipTextDrawer;
+ import org.scilab.modules.renderer.JoGLView.util.LightingUtils;
  
 -
  import java.awt.Component;
  import java.awt.Dimension;
  import java.nio.ByteBuffer;