Improve light properties naming 55/12655/5
Pedro Arthur [Wed, 25 Sep 2013 02:18:16 +0000 (23:18 -0300)]
Change-Id: Ic6c1c889c1f8c95abb9c79e2b77234d7f1931c66

37 files changed:
scilab/modules/graphic_objects/includes/graphicObjectProperties.h
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/lighting/Light.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/surface/Surface.java
scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/demos/lighting/color_light.dem.sce
scilab/modules/graphics/demos/lighting/dir_light.dem.sce
scilab/modules/graphics/demos/lighting/rot_light.dem.sce
scilab/modules/graphics/demos/lighting/simple_light.dem.sce
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/help/en_US/3d_plot/surface_properties.xml
scilab/modules/graphics/help/en_US/graphics_entities.xml
scilab/modules/graphics/help/en_US/lighting/light_properties.xml
scilab/modules/graphics/help/en_US/lighting/lighting.xml
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/src/c/Light.c
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_direction_property.c [moved from scilab/modules/graphics/src/c/getHandleProperty/get_light_direction_property.c with 72% similarity]
scilab/modules/graphics/src/c/getHandleProperty/get_light_position_property.c [deleted file]
scilab/modules/graphics/src/c/getHandleProperty/get_lighting_property.c [deleted file]
scilab/modules/graphics/src/c/getHandleProperty/get_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_use_color_material_property.c [moved from scilab/modules/graphics/src/c/getHandleProperty/get_color_material_property.c with 83% similarity]
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/set_direction_property.c [new file with mode: 0644]
scilab/modules/graphics/src/c/getHandleProperty/set_light_direction_property.c [deleted file]
scilab/modules/graphics/src/c/getHandleProperty/set_light_position_property.c [deleted file]
scilab/modules/graphics/src/c/getHandleProperty/set_lighting_property.c [deleted file]
scilab/modules/graphics/src/c/getHandleProperty/set_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_use_color_material_property.c [moved from scilab/modules/graphics/src/c/getHandleProperty/set_color_material_property.c with 80% similarity]
scilab/modules/graphics/tests/unit_tests/light.dia.ref
scilab/modules/graphics/tests/unit_tests/light.tst
scilab/modules/io/macros/%_save.sci

index 3a63f6f..40d9e0f 100644 (file)
 #define __GO_AMBIENTCOLOR__ 303
 #define __GO_DIFFUSECOLOR__ 304
 #define __GO_SPECULARCOLOR__ 305
-#define __GO_COLORMATERIAL__ 306
+#define __GO_COLOR_MATERIAL__ 306
 #define __GO_MATERIAL_SHININESS__ 307
 #define __GO_LIGHT__ 308
 #define __GO_LIGHT_TYPE__ 309
-#define __GO_LIGHT_DIRECTION__ 310
-#define __GO_LIGHT_POSITION__ 311
 
 #endif /* !__GRAPHIC_OBJECT_PROPERTIES_H__ */
index 4a8594c..cb465db 100644 (file)
@@ -326,11 +326,9 @@ public class GraphicObjectProperties {
     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_COLORMATERIAL__ = 306;
+    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_LIGHT_DIRECTION__ = 310;
-    public static final int __GO_LIGHT_POSITION__ = 311;
 
 }
index e952264..c742463 100644 (file)
@@ -152,9 +152,9 @@ public class Light extends GraphicObject {
                 return ColorTriplet.ColorTripletProperty.SPECULARCOLOR;
             case __GO_LIGHT_TYPE__ :
                 return LightProperty.TYPE;
-            case __GO_LIGHT_POSITION__ :
+            case __GO_POSITION__ :
                 return LightProperty.POSITION;
-            case __GO_LIGHT_DIRECTION__ :
+            case __GO_DIRECTION__ :
                 return LightProperty.DIRECTION;
             default :
                 return super.getPropertyFromName(propertyName);
index 7163a64..e342fe5 100644 (file)
@@ -73,7 +73,7 @@ public abstract class Surface extends ClippableContouredObject {
                 return ColorTriplet.ColorTripletProperty.DIFFUSECOLOR;
             case __GO_SPECULARCOLOR__ :
                 return ColorTriplet.ColorTripletProperty.SPECULARCOLOR;
-            case __GO_COLORMATERIAL__ :
+            case __GO_COLOR_MATERIAL__ :
                 return Material.MaterialProperty.COLOR_MATERIAL;
             case __GO_MATERIAL_SHININESS__ :
                 return Material.MaterialProperty.SHININESS;
index c1e3282..fbfd067 100644 (file)
@@ -345,10 +345,8 @@ __GO_AMBIENTCOLOR__
 __GO_DIFFUSECOLOR__
 __GO_SPECULARCOLOR__
 
-__GO_COLORMATERIAL__
+__GO_COLOR_MATERIAL__
 __GO_MATERIAL_SHININESS__
 
 __GO_LIGHT__
 __GO_LIGHT_TYPE__
-__GO_LIGHT_DIRECTION__
-__GO_LIGHT_POSITION__
index ba75354..58abf54 100644 (file)
@@ -333,19 +333,17 @@ src/c/get_ticks_utils.c \
 src/c/getHandleProperty/get_ambient_color_property.c \
 src/c/getHandleProperty/get_diffuse_color_property.c \
 src/c/getHandleProperty/get_specular_color_property.c \
-src/c/getHandleProperty/get_color_material_property.c \
+src/c/getHandleProperty/get_use_color_material_property.c \
 src/c/getHandleProperty/get_material_shininess_property.c \
 src/c/getHandleProperty/get_light_type_property.c \
-src/c/getHandleProperty/get_light_direction_property.c \
-src/c/getHandleProperty/get_light_position_property.c \
+src/c/getHandleProperty/get_direction_property.c \
 src/c/getHandleProperty/set_ambient_color_property.c \
 src/c/getHandleProperty/set_diffuse_color_property.c \
 src/c/getHandleProperty/set_specular_color_property.c \
-src/c/getHandleProperty/set_color_material_property.c \
+src/c/getHandleProperty/set_use_color_material_property.c \
 src/c/getHandleProperty/set_material_shininess_property.c \
 src/c/getHandleProperty/set_light_type_property.c \
-src/c/getHandleProperty/set_light_direction_property.c \
-src/c/getHandleProperty/set_light_position_property.c \
+src/c/getHandleProperty/set_direction_property.c \
 src/c/Light.c
 
 
index 750fc88..57ad3ce 100644 (file)
@@ -479,19 +479,17 @@ am__objects_1 = libscigraphics_algo_la-GetCommandArg.lo \
        libscigraphics_algo_la-get_ambient_color_property.lo \
        libscigraphics_algo_la-get_diffuse_color_property.lo \
        libscigraphics_algo_la-get_specular_color_property.lo \
-       libscigraphics_algo_la-get_color_material_property.lo \
+       libscigraphics_algo_la-get_use_color_material_property.lo \
        libscigraphics_algo_la-get_material_shininess_property.lo \
        libscigraphics_algo_la-get_light_type_property.lo \
-       libscigraphics_algo_la-get_light_direction_property.lo \
-       libscigraphics_algo_la-get_light_position_property.lo \
+       libscigraphics_algo_la-get_direction_property.lo \
        libscigraphics_algo_la-set_ambient_color_property.lo \
        libscigraphics_algo_la-set_diffuse_color_property.lo \
        libscigraphics_algo_la-set_specular_color_property.lo \
-       libscigraphics_algo_la-set_color_material_property.lo \
+       libscigraphics_algo_la-set_use_color_material_property.lo \
        libscigraphics_algo_la-set_material_shininess_property.lo \
        libscigraphics_algo_la-set_light_type_property.lo \
-       libscigraphics_algo_la-set_light_direction_property.lo \
-       libscigraphics_algo_la-set_light_position_property.lo \
+       libscigraphics_algo_la-set_direction_property.lo \
        libscigraphics_algo_la-Light.lo
 am_libscigraphics_algo_la_OBJECTS = $(am__objects_1)
 libscigraphics_algo_la_OBJECTS = $(am_libscigraphics_algo_la_OBJECTS)
@@ -1216,19 +1214,17 @@ src/c/get_ticks_utils.c \
 src/c/getHandleProperty/get_ambient_color_property.c \
 src/c/getHandleProperty/get_diffuse_color_property.c \
 src/c/getHandleProperty/get_specular_color_property.c \
-src/c/getHandleProperty/get_color_material_property.c \
+src/c/getHandleProperty/get_use_color_material_property.c \
 src/c/getHandleProperty/get_material_shininess_property.c \
 src/c/getHandleProperty/get_light_type_property.c \
-src/c/getHandleProperty/get_light_direction_property.c \
-src/c/getHandleProperty/get_light_position_property.c \
+src/c/getHandleProperty/get_direction_property.c \
 src/c/getHandleProperty/set_ambient_color_property.c \
 src/c/getHandleProperty/set_diffuse_color_property.c \
 src/c/getHandleProperty/set_specular_color_property.c \
-src/c/getHandleProperty/set_color_material_property.c \
+src/c/getHandleProperty/set_use_color_material_property.c \
 src/c/getHandleProperty/set_material_shininess_property.c \
 src/c/getHandleProperty/set_light_type_property.c \
-src/c/getHandleProperty/set_light_direction_property.c \
-src/c/getHandleProperty/set_light_position_property.c \
+src/c/getHandleProperty/set_direction_property.c \
 src/c/Light.c
 
 GATEWAY_C_SOURCES = sci_gateway/c/sci_swap_handles.c \
@@ -1613,7 +1609,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_closed_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_color_flag_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_color_map_property.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_color_material_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_color_mode_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_color_range_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_colored_property.Plo@am__quote@
@@ -1627,6 +1622,7 @@ distclean-compile:
 @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@
@@ -1662,8 +1658,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_labels_font_size_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_labels_font_style_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_legend_location_property.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_light_direction_property.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_light_position_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_light_type_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_line_mode_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_line_style_property.Plo@am__quote@
@@ -1707,6 +1701,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_title_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_triangles_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_type_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_use_color_material_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_user_data_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_view_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-get_viewport_property.Plo@am__quote@
@@ -1766,7 +1761,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_closed_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_color_flag_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_color_map_property.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_color_material_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_color_mode_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_color_range_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_colored_property.Plo@am__quote@
@@ -1779,6 +1773,7 @@ distclean-compile:
 @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_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@
@@ -1813,8 +1808,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_labels_font_color_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_labels_font_size_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_legend_location_property.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_light_direction_property.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_light_position_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_light_type_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_line_mode_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_line_style_property.Plo@am__quote@
@@ -1856,6 +1849,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_tight_limits_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_title_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_triangles_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_use_color_material_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_user_data_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_view_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_algo_la-set_viewport_property.Plo@am__quote@
@@ -4118,12 +4112,12 @@ libscigraphics_algo_la-get_specular_color_property.lo: src/c/getHandleProperty/g
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-get_specular_color_property.lo `test -f 'src/c/getHandleProperty/get_specular_color_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_specular_color_property.c
 
-libscigraphics_algo_la-get_color_material_property.lo: src/c/getHandleProperty/get_color_material_property.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-get_color_material_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-get_color_material_property.Tpo -c -o libscigraphics_algo_la-get_color_material_property.lo `test -f 'src/c/getHandleProperty/get_color_material_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_color_material_property.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigraphics_algo_la-get_color_material_property.Tpo $(DEPDIR)/libscigraphics_algo_la-get_color_material_property.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_color_material_property.c' object='libscigraphics_algo_la-get_color_material_property.lo' libtool=yes @AMDEPBACKSLASH@
+libscigraphics_algo_la-get_use_color_material_property.lo: src/c/getHandleProperty/get_use_color_material_property.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-get_use_color_material_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-get_use_color_material_property.Tpo -c -o libscigraphics_algo_la-get_use_color_material_property.lo `test -f 'src/c/getHandleProperty/get_use_color_material_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_use_color_material_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigraphics_algo_la-get_use_color_material_property.Tpo $(DEPDIR)/libscigraphics_algo_la-get_use_color_material_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_use_color_material_property.c' object='libscigraphics_algo_la-get_use_color_material_property.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-get_color_material_property.lo `test -f 'src/c/getHandleProperty/get_color_material_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_color_material_property.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-get_use_color_material_property.lo `test -f 'src/c/getHandleProperty/get_use_color_material_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_use_color_material_property.c
 
 libscigraphics_algo_la-get_material_shininess_property.lo: src/c/getHandleProperty/get_material_shininess_property.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-get_material_shininess_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-get_material_shininess_property.Tpo -c -o libscigraphics_algo_la-get_material_shininess_property.lo `test -f 'src/c/getHandleProperty/get_material_shininess_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_material_shininess_property.c
@@ -4139,19 +4133,12 @@ libscigraphics_algo_la-get_light_type_property.lo: src/c/getHandleProperty/get_l
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-get_light_type_property.lo `test -f 'src/c/getHandleProperty/get_light_type_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_light_type_property.c
 
-libscigraphics_algo_la-get_light_direction_property.lo: src/c/getHandleProperty/get_light_direction_property.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-get_light_direction_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-get_light_direction_property.Tpo -c -o libscigraphics_algo_la-get_light_direction_property.lo `test -f 'src/c/getHandleProperty/get_light_direction_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_light_direction_property.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigraphics_algo_la-get_light_direction_property.Tpo $(DEPDIR)/libscigraphics_algo_la-get_light_direction_property.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_light_direction_property.c' object='libscigraphics_algo_la-get_light_direction_property.lo' libtool=yes @AMDEPBACKSLASH@
+libscigraphics_algo_la-get_direction_property.lo: src/c/getHandleProperty/get_direction_property.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-get_direction_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-get_direction_property.Tpo -c -o libscigraphics_algo_la-get_direction_property.lo `test -f 'src/c/getHandleProperty/get_direction_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_direction_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigraphics_algo_la-get_direction_property.Tpo $(DEPDIR)/libscigraphics_algo_la-get_direction_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_direction_property.c' object='libscigraphics_algo_la-get_direction_property.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-get_light_direction_property.lo `test -f 'src/c/getHandleProperty/get_light_direction_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_light_direction_property.c
-
-libscigraphics_algo_la-get_light_position_property.lo: src/c/getHandleProperty/get_light_position_property.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-get_light_position_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-get_light_position_property.Tpo -c -o libscigraphics_algo_la-get_light_position_property.lo `test -f 'src/c/getHandleProperty/get_light_position_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_light_position_property.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigraphics_algo_la-get_light_position_property.Tpo $(DEPDIR)/libscigraphics_algo_la-get_light_position_property.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_light_position_property.c' object='libscigraphics_algo_la-get_light_position_property.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-get_light_position_property.lo `test -f 'src/c/getHandleProperty/get_light_position_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_light_position_property.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-get_direction_property.lo `test -f 'src/c/getHandleProperty/get_direction_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_direction_property.c
 
 libscigraphics_algo_la-set_ambient_color_property.lo: src/c/getHandleProperty/set_ambient_color_property.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-set_ambient_color_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-set_ambient_color_property.Tpo -c -o libscigraphics_algo_la-set_ambient_color_property.lo `test -f 'src/c/getHandleProperty/set_ambient_color_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_ambient_color_property.c
@@ -4174,12 +4161,12 @@ libscigraphics_algo_la-set_specular_color_property.lo: src/c/getHandleProperty/s
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-set_specular_color_property.lo `test -f 'src/c/getHandleProperty/set_specular_color_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_specular_color_property.c
 
-libscigraphics_algo_la-set_color_material_property.lo: src/c/getHandleProperty/set_color_material_property.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-set_color_material_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-set_color_material_property.Tpo -c -o libscigraphics_algo_la-set_color_material_property.lo `test -f 'src/c/getHandleProperty/set_color_material_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_color_material_property.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigraphics_algo_la-set_color_material_property.Tpo $(DEPDIR)/libscigraphics_algo_la-set_color_material_property.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_color_material_property.c' object='libscigraphics_algo_la-set_color_material_property.lo' libtool=yes @AMDEPBACKSLASH@
+libscigraphics_algo_la-set_use_color_material_property.lo: src/c/getHandleProperty/set_use_color_material_property.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-set_use_color_material_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-set_use_color_material_property.Tpo -c -o libscigraphics_algo_la-set_use_color_material_property.lo `test -f 'src/c/getHandleProperty/set_use_color_material_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_use_color_material_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigraphics_algo_la-set_use_color_material_property.Tpo $(DEPDIR)/libscigraphics_algo_la-set_use_color_material_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_use_color_material_property.c' object='libscigraphics_algo_la-set_use_color_material_property.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-set_color_material_property.lo `test -f 'src/c/getHandleProperty/set_color_material_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_color_material_property.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-set_use_color_material_property.lo `test -f 'src/c/getHandleProperty/set_use_color_material_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_use_color_material_property.c
 
 libscigraphics_algo_la-set_material_shininess_property.lo: src/c/getHandleProperty/set_material_shininess_property.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-set_material_shininess_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-set_material_shininess_property.Tpo -c -o libscigraphics_algo_la-set_material_shininess_property.lo `test -f 'src/c/getHandleProperty/set_material_shininess_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_material_shininess_property.c
@@ -4195,19 +4182,12 @@ libscigraphics_algo_la-set_light_type_property.lo: src/c/getHandleProperty/set_l
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-set_light_type_property.lo `test -f 'src/c/getHandleProperty/set_light_type_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_light_type_property.c
 
-libscigraphics_algo_la-set_light_direction_property.lo: src/c/getHandleProperty/set_light_direction_property.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-set_light_direction_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-set_light_direction_property.Tpo -c -o libscigraphics_algo_la-set_light_direction_property.lo `test -f 'src/c/getHandleProperty/set_light_direction_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_light_direction_property.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigraphics_algo_la-set_light_direction_property.Tpo $(DEPDIR)/libscigraphics_algo_la-set_light_direction_property.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_light_direction_property.c' object='libscigraphics_algo_la-set_light_direction_property.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-set_light_direction_property.lo `test -f 'src/c/getHandleProperty/set_light_direction_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_light_direction_property.c
-
-libscigraphics_algo_la-set_light_position_property.lo: src/c/getHandleProperty/set_light_position_property.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-set_light_position_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-set_light_position_property.Tpo -c -o libscigraphics_algo_la-set_light_position_property.lo `test -f 'src/c/getHandleProperty/set_light_position_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_light_position_property.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigraphics_algo_la-set_light_position_property.Tpo $(DEPDIR)/libscigraphics_algo_la-set_light_position_property.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_light_position_property.c' object='libscigraphics_algo_la-set_light_position_property.lo' libtool=yes @AMDEPBACKSLASH@
+libscigraphics_algo_la-set_direction_property.lo: src/c/getHandleProperty/set_direction_property.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-set_direction_property.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-set_direction_property.Tpo -c -o libscigraphics_algo_la-set_direction_property.lo `test -f 'src/c/getHandleProperty/set_direction_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_direction_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigraphics_algo_la-set_direction_property.Tpo $(DEPDIR)/libscigraphics_algo_la-set_direction_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_direction_property.c' object='libscigraphics_algo_la-set_direction_property.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-set_light_position_property.lo `test -f 'src/c/getHandleProperty/set_light_position_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_light_position_property.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_algo_la-set_direction_property.lo `test -f 'src/c/getHandleProperty/set_direction_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_direction_property.c
 
 libscigraphics_algo_la-Light.lo: src/c/Light.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_algo_la-Light.lo -MD -MP -MF $(DEPDIR)/libscigraphics_algo_la-Light.Tpo -c -o libscigraphics_algo_la-Light.lo `test -f 'src/c/Light.c' || echo '$(srcdir)/'`src/c/Light.c
index 0ba4be3..f513b38 100644 (file)
@@ -15,10 +15,9 @@ function demo_color_light()
     my_plot_desc          = "Color light";
     my_handle.figure_name = my_plot_desc;
 
-    my_handle.figure_name = my_plot_desc;
     plot3d;l=light();s=gce();
 
-    s.color_material = "off";
+    s.use_color_material = "off";
     s.color_flag = 0;
     s.thickness = 0;
     s.hiddencolor = -1;
@@ -54,4 +53,4 @@ endfunction
 
 
 demo_color_light();
-clear demo_color_light;
\ No newline at end of file
+clear demo_color_light;
index 8675cf3..0e588ad 100644 (file)
@@ -14,14 +14,13 @@ function demo_dir_light()
     my_plot_desc          = "Directional light";
     my_handle.figure_name = my_plot_desc;
 
-    my_handle.figure_name = my_plot_desc;
     plot3d;l=light();s=gce();
 
     l.light_type = "directional";
-    l.light_direction = [1 0 1];
+    l.direction = [1 0 1];
     l.ambient_color = [0.1 0.1 0.1];
     s.diffuse_color = [0.5 0.4 0.4];
-    s.color_material = "off";
+    s.use_color_material = "off";
     s.color_flag = 0;
     s.thickness = 0;
     s.hiddencolor = -1;
index 79c36ce..2ca3304 100644 (file)
@@ -15,15 +15,14 @@ function demo_rot_light()
     my_plot_desc          = "Rotating light";
     my_handle.figure_name = my_plot_desc;
 
-    my_handle.figure_name = my_plot_desc;
     plot3d;l=light();s=gce();
 
-    for i=0:10000
+    for i=0:2000
         sleep(5);
         x = 2*cos(i*%pi/180);
         y = 2*sin(i*%pi/180);
         z = 2;
-        l.light_position = [x y z];
+        l.position = [x y z];
     end
 
     // DEMO END
index ec6fd67..9ffdcb2 100644 (file)
@@ -15,12 +15,11 @@ function demo_simple_light()
     my_plot_desc          = "Simple light";
     my_handle.figure_name = my_plot_desc;
 
-    my_handle.figure_name = my_plot_desc;
     plot3d;l=light();s=gce();
 
     l.ambient_color = [1 1 1];
     s.diffuse_color = [0 0 0.8];
-    s.color_material = "off";
+    s.use_color_material = "off";
     s.color_flag = 0;
     s.thickness = 0;
     s.hiddencolor = -1;
@@ -33,4 +32,4 @@ endfunction
 
 
 demo_simple_light();
-clear demo_simple_light;
\ No newline at end of file
+clear demo_simple_light;
index 47e2323..e2d8eb3 100644 (file)
@@ -243,7 +243,6 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\get_closed_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_color_flag_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_color_map_property.c" />
-    <ClCompile Include="src\c\getHandleProperty\get_color_material_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_color_mode_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_color_range_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_colored_property.c" />
@@ -257,6 +256,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <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" />
@@ -292,8 +292,6 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\get_labels_font_size_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_labels_font_style_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_legend_location_property.c" />
-    <ClCompile Include="src\c\getHandleProperty\get_light_direction_property.c" />
-    <ClCompile Include="src\c\getHandleProperty\get_light_position_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_light_type_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_line_mode_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_line_style_property.c" />
@@ -327,18 +325,18 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\get_text_box_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_text_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_thickness_property.c" />
+    <ClCompile Include="src\c\getHandleProperty\get_use_color_material_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_ambient_color_property.c" />
-    <ClCompile Include="src\c\getHandleProperty\set_color_material_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_diffuse_color_property.c" />
+    <ClCompile Include="src\c\getHandleProperty\set_direction_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_figure_closerequestfcn_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_figure_resizefcn_property.c" />
-    <ClCompile Include="src\c\getHandleProperty\set_light_direction_property.c" />
-    <ClCompile Include="src\c\getHandleProperty\set_light_position_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_light_type_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_material_shininess_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_specular_color_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_image_type_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_tag_property.c" />
+    <ClCompile Include="src\c\getHandleProperty\set_use_color_material_property.c" />
     <ClCompile Include="src\c\get_ticks_utils.c" />
     <ClCompile Include="src\c\getHandleProperty\get_tics_color_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_tics_direction_property.c" />
index 5305e02..04612e9 100644 (file)
     <ClCompile Include="src\c\getHandleProperty\get_ambient_color_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\getHandleProperty\get_color_material_property.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\get_diffuse_color_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\getHandleProperty\get_light_direction_property.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\c\getHandleProperty\get_light_position_property.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\get_light_type_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\set_ambient_color_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\getHandleProperty\set_color_material_property.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\set_diffuse_color_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\getHandleProperty\set_light_direction_property.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\c\getHandleProperty\set_light_position_property.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\set_light_type_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="sci_gateway\c\sci_light.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\c\getHandleProperty\get_direction_property.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\c\getHandleProperty\get_use_color_material_property.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\c\getHandleProperty\set_use_color_material_property.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\c\getHandleProperty\set_direction_property.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="includes\Axes.h">
index 7fca569..9adfdb5 100644 (file)
                 </listitem>
             </varlistentry>
             <varlistentry>
+                <term>use_color_material: </term>
+                <listitem>
+                    <para>This field is use to enable the use of the surface color as diffuse color.
+                        Its default value is <literal>"on"</literal>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>material_shininess: </term>
+                <listitem>
+                    <para>This field defines the shininess level of the surface.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>ambient_color: </term>
+                <listitem>
+                    <para>This field defines the ambient color of the surface.
+                        The color is defined by a 3 element vector <literal>"[red, green, blue]"</literal>
+                        with each element in the range [0, 1].
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>diffuse_color: </term>
+                <listitem>
+                    <para>This field defines the diffuse color of the surface.
+                        The color is defined by a 3 element vector <literal>"[red, green, blue]"</literal>
+                        with each element in the range [0, 1]. Notice that this field is
+                        only used when use_color_material is disabled.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>specular_color: </term>
+                <listitem>
+                    <para>This field defines the specular color of the surface.
+                        The color is defined by a 3 element vector <literal>"[red, green, blue]"</literal>
+                        with each element in the range [0, 1].
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
                 <term>user_data: </term>
                 <listitem>
                     <para>This field can be use to store any scilab variable in the surface
index 81c7575..962281a 100644 (file)
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>Light: </term>
+                <listitem>
+                    <para>
+                        Lights in scilab aproximates real world lighting where the appearence of
+                        a surface is given by interactions between light rays and the material properties of the
+                        surface. Because simulate real world lighting is complex
+                        and computationaly expesive, one uses a simplified model.
+                    </para>
+                    <para>
+                        See <link linkend="light_properties">light entity properties</link> for details.
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
index 3790027..597972d 100644 (file)
@@ -31,6 +31,7 @@
             s = gce();
             s.diffuse_color = [0 0 0.8];
             s.ambient_color = [0 0 1];
+            s.use_color_material = "off";
         </scilab:image>
     </refsection>
     <refsection>
@@ -58,7 +59,7 @@
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>light_direction: </term>
+                <term>direction: </term>
                 <listitem>
                     <para>This field defines the ray direction for directional light.
                         The direction can be chaged using a 3 element vector <literal>"[x, y, z]"</literal>
@@ -67,7 +68,7 @@
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>light_position: </term>
+                <term>position: </term>
                 <listitem>
                     <para>This field defines the light position for point light.
                         The position can be changed using a 3 element vector <literal>"[x, y, z]"</literal>.
     </refsection>
     <refsection>
         <title>Examples</title>
-        
         <programlisting role="example"><![CDATA[
         // point light
         plot3d;l=light();s=gce();
             x = 2*cos(i*%pi/180);
             y = 2*sin(i*%pi/180);
             z = 2;
-            l.light_position = [x y z];
+            l.position = [x y z];
         end
 
         // change light to directional mode
         l.light_type = "directional";
-        l.light_direction = [1 0 1];
+        l.direction = [1 0 1];
         l.ambient_color = [0.1 0.1 0.1];
         s.diffuse_color = [0.4 0.4 0.4];
-        s.color_material = "off";
+        s.use_color_material = "off";
         s.color_flag = 0;
         s.thickness = 0;
         s.hiddencolor = -1;
index 533927b..f56c2bc 100644 (file)
                 Specular color defines the specular highlight color.
             </para>
         </listitem>
-        
         <para>
             Following one can compare the surface with and without lighting:
         </para>
         <para>
             <scilab:image>
                 plot3d();
-                light = light();
+                l = light();
             </scilab:image>
         </para>
         <para>
@@ -69,7 +68,6 @@
                 plot3d();
             </scilab:image>
         </para>
-        
     </refsection>
     <refsection>
         <title>Lighting properties list</title>
@@ -97,7 +95,7 @@
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>light_direction: </term>
+                <term>direction: </term>
                 <listitem>
                     <para>This field defines the ray direction for directional light.
                         The direction can be chaged using a 3 element vector <literal>"[x, y, z]"</literal> 
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>light_position: </term>
+                <term>position: </term>
                 <listitem>
                     <para>This field defines the light position for point light.
                         The position can be changed using a 3 element vector <literal>"[x, y, z]"</literal>.
         <para>Surface properties </para>
         <variablelist>
             <varlistentry>
-                <term>color_material: </term>
+                <term>use_color_material: </term>
                 <listitem>
                     <para>This field is use to enable the use of the surface color as diffuse color.
                         Its default value is <literal>"on"</literal>.
                     <para>This field defines the diffuse color of the surface.
                         The color is defined by a 3 element vector <literal>"[red, green, blue]"</literal>
                         with each element in the range [0, 1]. Notice that this field is
-                        only used when color_material is disabled.
+                        only used when use_color_material is disabled.
                     </para>
                 </listitem>
             </varlistentry>
@@ -199,10 +197,10 @@ s=gce();
 s.color_flag=0;
 s.thickness=0;
 s.hiddencolor = -1;
-light = light();
+light();
 //change diffuse color to orange
 s.diffuse_color = [1, 0.6, 0];
-s.color_material="off";
+s.use_color_material="off";
 //black spots turn dark orange
 s.ambient_color = [1, 0.6, 0];
          ]]></programlisting>
@@ -212,14 +210,14 @@ s.ambient_color = [1, 0.6, 0];
         <programlisting role="example"><![CDATA[
 plot3d();
 s=gce();
-light = light();
+l = light();
 s.color_flag=0;
 s.thickness=0;
-light.light_type = "directional";
-light.light_direction = [0 0 1];
-light.diffuse_color = [1 0.9 0.9];
-light.ambient_color = [0.5 0.4 0.4];
-light.specular_color = [0.5 0.3 0.7];
+l.light_type = "directional";
+l.direction = [0 0 1];
+l.diffuse_color = [1 0.9 0.9];
+l.ambient_color = [0.5 0.4 0.4];
+l.specular_color = [0.5 0.3 0.7];
          ]]></programlisting>
     </refsection>
     <refsection role="see also">
@@ -232,6 +230,9 @@ light.specular_color = [0.5 0.3 0.7];
                 <link linkend="light_properties">light properties</link>
             </member>
             <member>
+                <link linkend="surface_properties">surface properties</link>
+            </member>
+            <member>
                 <link linkend="delete">delete</link>
             </member>
         </simplelist>
index bd14f84..0cd5567 100644 (file)
@@ -648,7 +648,7 @@ function %h_p(h)
                 "ambient_color = "+sci2exp(h.ambient_color)
                 "diffuse_color = "+sci2exp(h.diffuse_color)
                 "specular_color = "+sci2exp(h.specular_color)
-                "color_material = "+sci2exp(h.color_material)
+                "use_color_material = "+sci2exp(h.use_color_material)
                 "material_shininess = "+sci2exp(h.material_shininess)
                 "user_data = "+fmtuser_data(u)
                 "tag = "+h.tag
@@ -678,7 +678,7 @@ function %h_p(h)
                 "ambient_color = "+sci2exp(h.ambient_color)
                 "diffuse_color = "+sci2exp(h.diffuse_color)
                 "specular_color = "+sci2exp(h.specular_color)
-                "color_material = "+sci2exp(h.color_material)
+                "use_color_material = "+sci2exp(h.use_color_material)
                 "material_shininess = "+sci2exp(h.material_shininess)
                 "user_data = "+fmtuser_data(u)
                 "tag = "+h.tag
@@ -747,7 +747,7 @@ function %h_p(h)
                 "ambient_color = "+sci2exp(h.ambient_color)
                 "diffuse_color = "+sci2exp(h.diffuse_color)
                 "specular_color = "+sci2exp(h.specular_color)
-                "color_material = "+sci2exp(h.color_material)
+                "use_color_material = "+sci2exp(h.use_color_material)
                 "material_shininess = "+sci2exp(h.material_shininess)
                 "user_data = "+fmtuser_data(u)
                 "tag = "+h.tag
@@ -777,7 +777,7 @@ function %h_p(h)
                 "ambient_color = "+sci2exp(h.ambient_color)
                 "diffuse_color = "+sci2exp(h.diffuse_color)
                 "specular_color = "+sci2exp(h.specular_color)
-                "color_material = "+sci2exp(h.color_material)
+                "usecolor_material = "+sci2exp(h.use_color_material)
                 "material_shininess = "+sci2exp(h.material_shininess)
                 "user_data = "+fmtuser_data(u)
                 "tag = "+h.tag
@@ -928,7 +928,7 @@ function %h_p(h)
             "Children: "+fmtchildren(h.children)
             "ShowHiddenHandles: "+sci2exp(h.showhiddenhandles)
             ]
-                       // Light
+            // Light
             // =====================================================================
 
         case "Light"
@@ -936,8 +936,8 @@ function %h_p(h)
             "parent: "+h.parent.type
             "visible = "+sci2exp(h.visible)
             "light_type = "+sci2exp(h.light_type)
-            "light_position = "+sci2exp(h.light_position)
-            "light_direction = "+sci2exp(h.light_direction)
+            "position = "+sci2exp(h.position)
+            "direction = "+sci2exp(h.direction)
             "ambient_color = "+sci2exp(h.ambient_color)
             "diffuse_color = "+sci2exp(h.diffuse_color)
             "specular_color= "+sci2exp(h.specular_color)
index b235e76..d49caad 100644 (file)
@@ -86,12 +86,12 @@ BOOL createLight(char* fname, long long axes_handle, int type, BOOL visible, dou
 \r
     if (position)\r
     {\r
-        setGraphicObjectProperty(light, __GO_LIGHT_POSITION__, position, jni_double_vector, 3);\r
+        setGraphicObjectProperty(light, __GO_POSITION__, position, jni_double_vector, 3);\r
     }\r
 \r
     if (direction)\r
     {\r
-        setGraphicObjectProperty(light, __GO_LIGHT_DIRECTION__, direction, jni_double_vector, 3);\r
+        setGraphicObjectProperty(light, __GO_DIRECTION__, direction, jni_double_vector, 3);\r
     }\r
 \r
     if (isValidColor(ambient_color))\r
index a8b5d77..a065469 100644 (file)
@@ -46,7 +46,7 @@ typedef struct
  * don't forget to modify it each time the propertyTable
  * is modified.
  */
-#define NB_PROPERTIES 171
+#define NB_PROPERTIES 170
 
 /**
  * list of all property names and associated functions in scilab
@@ -219,11 +219,10 @@ static getHashTableCouple propertyTable[NB_PROPERTIES] =
     {"ambient_color", get_ambient_color_property},
     {"diffuse_color", get_diffuse_color_property},
     {"specular_color", get_specular_color_property},
-    {"color_material", get_color_material_property},
+    {"use_color_material", get_use_color_material_property},
     {"material_shininess", get_material_shininess_property},
     {"light_type", get_light_type_property},
-    {"light_direction", get_light_direction_property},
-    {"light_position", get_light_position_property},
+    {"direction", get_direction_property},
     {"image_type", get_image_type_property}
 };
 
index a937ea2..50df655 100644 (file)
@@ -52,7 +52,7 @@ typedef struct
 * don't forget to modify it each time the propertyTable
 * is modified.
 */
-#define NB_PROPERTIES 166
+#define NB_PROPERTIES 165
 
 /**
 * list of all property names and associated functions in scilab
@@ -220,11 +220,10 @@ static setHashTableCouple propertyTable[NB_PROPERTIES] =
     {"ambient_color", set_ambient_color_property},
     {"diffuse_color", set_diffuse_color_property},
     {"specular_color", set_specular_color_property},
-    {"color_material", set_color_material_property},
+    {"use_color_material", set_use_color_material_property},
     {"material_shininess", set_material_shininess_property},
     {"light_type", set_light_type_property},
-    {"light_direction", set_light_direction_property},
-    {"light_position", set_light_position_property},
+    {"direction", set_direction_property},
     {"image_type", set_image_type_property}
 };
 
index 16b45f8..ef2d113 100644 (file)
@@ -183,11 +183,10 @@ int get_UID(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_color_material_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_light_direction_property(void* _pvCtx, char* pobjUID);
-int get_light_position_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);
 
 #include "graphicObjectProperties.h"
 
 /**
- * Gets the direction of the light.
+ * Get the direction property of the handle.
  */
-int get_light_direction_property(void* _pvCtx, char* pobjUID)
+int get_direction_property(void* _pvCtx, char* pobjUID)
 {
     double* direction = NULL;
 
-    getGraphicObjectProperty(pobjUID, __GO_LIGHT_DIRECTION__, jni_double_vector, (void **)&direction);
+    getGraphicObjectProperty(pobjUID, __GO_DIRECTION__, jni_double_vector, (void **)&direction);
 
     if (direction == NULL)
     {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "light_direction");
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "direction");
         return -1;
     }
 
-    return sciReturnMatrix(_pvCtx, direction, 1, 3);
+    return sciReturnRowVector(_pvCtx, direction, 3);
 
 }
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/get_light_position_property.c b/scilab/modules/graphics/src/c/getHandleProperty/get_light_position_property.c
deleted file mode 100644 (file)
index ad5fa8d..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2013 - Pedro SOUZA
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-#include "getHandleProperty.h"
-#include "returnProperty.h"
-#include "Scierror.h"
-#include "localization.h"
-
-#include "getGraphicObjectProperty.h"
-#include "graphicObjectProperties.h"
-
-/**
- * Gets the position of the light.
- */
-int get_light_position_property(void* _pvCtx, char* pobjUID)
-{
-    double* position = NULL;
-
-    getGraphicObjectProperty(pobjUID, __GO_LIGHT_POSITION__, jni_double_vector, (void **)&position);
-
-    if (position == NULL)
-    {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "light_position");
-        return -1;
-    }
-
-    return sciReturnMatrix(_pvCtx, position, 1, 3);
-
-}
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/get_lighting_property.c b/scilab/modules/graphics/src/c/getHandleProperty/get_lighting_property.c
deleted file mode 100644 (file)
index 908637f..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2013 - Pedro SOUZA
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-
-#include "getHandleProperty.h"
-#include "GetProperty.h"
-#include "returnProperty.h"
-#include "Scierror.h"
-#include "localization.h"
-
-#include "getGraphicObjectProperty.h"
-#include "graphicObjectProperties.h"
-
-/**
- * Get the lighting status (on/off).
- */
-int get_lighting_property(void* _pvCtx, char* pobjUID)
-{
-    int iLighting = 0;
-    int *piLighting = &iLighting;
-
-    getGraphicObjectProperty(pobjUID, __GO_LIGHTING__, jni_bool, (void **)&piLighting);
-
-    if (piLighting == NULL)
-    {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "lighting");
-        return -1;
-    }
-
-    if (iLighting)
-    {
-        return sciReturnString(_pvCtx, "on");
-    }
-    else
-    {
-        return sciReturnString(_pvCtx, "off");
-    }
-}
index 79d7513..7a1569e 100644 (file)
@@ -5,6 +5,7 @@
  * Copyright (C) 2006 - INRIA - Jean-Baptiste Silvy
  * Copyright (C) 2010 - DIGITEO - Manuel Juliachs
  * Copyright (C) 2011 - DIGITEO - Vincent Couvert
+ * Copyright (C) 2013 - Pedro SOUZA
  *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
@@ -81,6 +82,21 @@ int get_position_property(void* _pvCtx, char* pobjUID)
         return sciReturnRowVector(_pvCtx, position, 2);
     }
 
+    if (iType == __GO_LIGHT__)
+    {
+        double* position = NULL;
+
+        getGraphicObjectProperty(pobjUID, __GO_POSITION__, jni_double_vector, (void **)&position);
+
+        if (position == NULL)
+        {
+            Scierror(999, _("'%s' property does not exist for this handle.\n"), "position");
+            return -1;
+        }
+
+        return sciReturnRowVector(_pvCtx, position, 3);
+    }
+
     /* Generic case : position is a 4 row vector */
 
     getGraphicObjectProperty(pobjUID, __GO_POSITION__, jni_double_vector, (void **) &position);
 /**
  * Returns if the diffuse color is used (on/off).
  */
-int get_color_material_property(void* _pvCtx, char* pobjUID)
+int get_use_color_material_property(void* _pvCtx, char* pobjUID)
 {
     int iColorMaterial = 0;
     int *piColorMaterial = &iColorMaterial;
 
-    getGraphicObjectProperty(pobjUID, __GO_COLORMATERIAL__, jni_bool, (void **)&piColorMaterial);
+    getGraphicObjectProperty(pobjUID, __GO_COLOR_MATERIAL__, jni_bool, (void **)&piColorMaterial);
 
     if (piColorMaterial == NULL)
     {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "color_material");
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "use_color_material");
         return -1;
     }
 
index faf4bc3..f080c3c 100644 (file)
@@ -183,11 +183,10 @@ int set_tag_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int
 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_color_material_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_light_direction_property(void* _pvCtx, char* pobj, void* _pvData, int valueType, int nbRow, int nbCol);
-int set_light_position_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);
 
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_direction_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_direction_property.c
new file mode 100644 (file)
index 0000000..4190179
--- /dev/null
@@ -0,0 +1,72 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2013 - Pedro SOUZA
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ *
+ */
+
+/*------------------------------------------------------------------------*/
+/* file: set_direction_property.c                                         */
+/* desc : function to modify in Scilab the direction field of             */
+/*        a handle                                                        */
+/*------------------------------------------------------------------------*/
+
+#include "setHandleProperty.h"
+#include "SetProperty.h"
+#include "getPropertyAssignedValue.h"
+#include "SetPropertyStatus.h"
+#include "Scierror.h"
+#include "localization.h"
+
+
+#include "setGraphicObjectProperty.h"
+#include "getGraphicObjectProperty.h"
+#include "graphicObjectProperties.h"
+
+/*------------------------------------------------------------------------*/
+int set_direction_property(void* _pvCtx, char* pobjUID, void* _pvData, int valueType, int nbRow, int nbCol)
+{
+    int type = -1;
+    int *piType = &type;
+    BOOL status = FALSE;
+
+    getGraphicObjectProperty(pobjUID, __GO_TYPE__, jni_int, (void **)&piType);
+
+    if (type == __GO_LIGHT__)
+    {
+        if (valueType != sci_matrix)
+        {
+            Scierror(999, _("Wrong type for '%s' property: Real matrix expected.\n"), "direction");
+            return SET_PROPERTY_ERROR;
+        }
+
+        if (nbRow * nbCol != 3)
+        {
+            Scierror(999, _("Wrong size for '%s' property: %d elements expected.\n"), "direction", 3);
+            return SET_PROPERTY_ERROR;
+        }
+
+        status = setGraphicObjectProperty(pobjUID, __GO_DIRECTION__, _pvData, jni_double_vector, 3);
+
+        if (status == TRUE)
+        {
+            return SET_PROPERTY_SUCCEED;
+        }
+        else
+        {
+            Scierror(999, _("'%s' property does not exist for this handle.\n"), "direction");
+            return SET_PROPERTY_ERROR;
+        }
+    }
+    else
+    {
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "direction");
+        return SET_PROPERTY_ERROR;
+    }
+}
+/*------------------------------------------------------------------------*/
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_light_direction_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_light_direction_property.c
deleted file mode 100644 (file)
index 48e3b11..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2013 - Pedro SOUZA
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-#include "setHandleProperty.h"
-#include "SetProperty.h"
-#include "getPropertyAssignedValue.h"
-#include "SetPropertyStatus.h"
-#include "Scierror.h"
-#include "localization.h"
-
-
-#include "setGraphicObjectProperty.h"
-#include "graphicObjectProperties.h"
-
-/**
- * Sets the direction of the light.
- */
-int set_light_direction_property(void* _pvCtx, char* pobjUID, void* _pvData, int valueType, int nbRow, int nbCol)
-{
-    BOOL status = FALSE;
-
-    if (valueType != sci_matrix)
-    {
-        Scierror(999, _("Wrong type for '%s' property: Real matrix expected.\n"), "light_direction");
-        return SET_PROPERTY_ERROR;
-    }
-
-    if (nbRow * nbCol != 3)
-    {
-        Scierror(999, _("Wrong size for '%s' property: %d elements expected.\n"), "light_direction", 3);
-        return SET_PROPERTY_ERROR;
-    }
-
-    status = setGraphicObjectProperty(pobjUID, __GO_LIGHT_DIRECTION__, _pvData, jni_double_vector, 3);
-
-    if (status == TRUE)
-    {
-        return SET_PROPERTY_SUCCEED;
-    }
-    else
-    {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "light_direction");
-        return SET_PROPERTY_ERROR;
-    }
-}
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_light_position_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_light_position_property.c
deleted file mode 100644 (file)
index 0cce538..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2013 - Pedro SOUZA
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-#include "setHandleProperty.h"
-#include "SetProperty.h"
-#include "getPropertyAssignedValue.h"
-#include "SetPropertyStatus.h"
-#include "Scierror.h"
-#include "localization.h"
-
-
-#include "setGraphicObjectProperty.h"
-#include "graphicObjectProperties.h"
-
-/**
- * Sets the position of the light.
- */
-int set_light_position_property(void* _pvCtx, char* pobjUID, void* _pvData, int valueType, int nbRow, int nbCol)
-{
-    BOOL status = FALSE;
-
-    if (valueType != sci_matrix)
-    {
-        Scierror(999, _("Wrong type for '%s' property: Real matrix expected.\n"), "light_position");
-        return SET_PROPERTY_ERROR;
-    }
-
-    if (nbRow * nbCol != 3)
-    {
-        Scierror(999, _("Wrong size for '%s' property: %d elements expected.\n"), "light_position", 3);
-        return SET_PROPERTY_ERROR;
-    }
-
-    status = setGraphicObjectProperty(pobjUID, __GO_LIGHT_POSITION__, _pvData, jni_double_vector, 3);
-
-    if (status == TRUE)
-    {
-        return SET_PROPERTY_SUCCEED;
-    }
-    else
-    {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "light_position");
-        return SET_PROPERTY_ERROR;
-    }
-}
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_lighting_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_lighting_property.c
deleted file mode 100644 (file)
index 75f1d90..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2013 - Pedro SOUZA
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-
-#include "setHandleProperty.h"
-#include "SetProperty.h"
-#include "getPropertyAssignedValue.h"
-#include "Scierror.h"
-#include "localization.h"
-#include "SetPropertyStatus.h"
-
-#include "setGraphicObjectProperty.h"
-#include "graphicObjectProperties.h"
-
-/**
- * Enables/disables lighting.
- */
-int set_lighting_property(void* _pvCtx, char* pobjUID, void* _pvData, int valueType, int nbRow, int nbCol)
-{
-    BOOL status;
-    int b =  (int)FALSE;
-
-    b = tryGetBooleanValueFromStack(_pvData, valueType, nbRow, nbCol, "lighting");
-    if (b == NOT_A_BOOLEAN_VALUE)
-    {
-        return SET_PROPERTY_ERROR;
-    }
-
-    status = setGraphicObjectProperty(pobjUID, __GO_LIGHTING__, &b, jni_bool, 1);
-
-    if (status == TRUE)
-    {
-        return SET_PROPERTY_SUCCEED;
-    }
-    else
-    {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "lighting");
-        return SET_PROPERTY_ERROR;
-    }
-}
index bfb6705..6298b10 100644 (file)
@@ -4,6 +4,7 @@
  * Copyright (C) 2006 - INRIA - Allan Cornet
  * Copyright (C) 2006 - INRIA - Jean-Baptiste Silvy
  * Copyright (C) 2010 - DIGITEO - Manuel Juliachs
+ * Copyright (C) 2013 - Pedro SOUZA
  *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
@@ -92,6 +93,34 @@ int set_position_property(void* _pvCtx, char* pobjUID, void* _pvData, int valueT
         }
 
     }
+    else if (type == __GO_LIGHT__)
+    {
+        double* values = (double*)_pvData;
+
+        if (valueType != sci_matrix)
+        {
+            Scierror(999, _("Wrong type for '%s' property: Real matrix expected.\n"), "position");
+            return SET_PROPERTY_ERROR;
+        }
+
+        if (nbRow * nbCol != 3)
+        {
+            Scierror(999, _("Wrong size for '%s' property: %d elements expected.\n"), "position", 3);
+            return SET_PROPERTY_ERROR;
+        }
+
+        status = setGraphicObjectProperty(pobjUID, __GO_POSITION__, values, jni_double_vector, 3);
+
+        if (status == TRUE)
+        {
+            return SET_PROPERTY_SUCCEED;
+        }
+        else
+        {
+            Scierror(999, _("'%s' property does not exist for this handle.\n"), "position");
+            return SET_PROPERTY_ERROR;
+        }
+    }
     else
     {
         Scierror(999, _("'%s' property does not exist for this handle.\n"), "position");
 /**
  * Enables/Disables the use of the diffuse color.
  */
-int set_color_material_property(void* _pvCtx, char* pobjUID, void* _pvData, int valueType, int nbRow, int nbCol)
+int set_use_color_material_property(void* _pvCtx, char* pobjUID, void* _pvData, int valueType, int nbRow, int nbCol)
 {
     BOOL status;
     int b =  (int)FALSE;
 
-    b = tryGetBooleanValueFromStack(_pvData, valueType, nbRow, nbCol, "color_material");
+    b = tryGetBooleanValueFromStack(_pvData, valueType, nbRow, nbCol, "use_color_material");
     if (b == NOT_A_BOOLEAN_VALUE)
     {
         return SET_PROPERTY_ERROR;
     }
 
-    status = setGraphicObjectProperty(pobjUID, __GO_COLORMATERIAL__, &b, jni_bool, 1);
+    status = setGraphicObjectProperty(pobjUID, __GO_COLOR_MATERIAL__, &b, jni_bool, 1);
 
     if (status == TRUE)
     {
@@ -43,7 +43,7 @@ int set_color_material_property(void* _pvCtx, char* pobjUID, void* _pvData, int
     }
     else
     {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "color_material");
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "use_color_material");
         return SET_PROPERTY_ERROR;
     }
 }
index 224f52d..b47a1d8 100644 (file)
@@ -35,8 +35,8 @@ assert_checkequal(l.parent.type, "Axes");
 assert_checkequal(l.children, []);\r
 assert_checkequal(l.visible, "off");\r
 assert_checkequal(l.light_type, "directional");\r
-assert_checktrue(l.light_position - [5 4 3] < 1d-7);\r
-assert_checktrue(l.light_direction - [2 1 0] < 1d-7);\r
+assert_checktrue(l.position - [5 4 3] < 1d-7);\r
+assert_checktrue(l.direction - [2 1 0] < 1d-7);\r
 assert_checktrue(l.ambient_color - [0.3 0.3 0.3] < 1d-7);\r
 assert_checktrue(l.diffuse_color - [0.2 0.2 0.2] < 1d-7);\r
 assert_checktrue(l.specular_color - [0.1 0.1 0.1] < 1d-7);\r
@@ -50,11 +50,11 @@ assert_checkequal(lasterror(), errmsg);
 errmsg=msprintf(_("Wrong type for ''%s'' property: Real matrix expected.\n"), "specular_color");\r
 ierr = execstr("l.specular_color = ''asd''", "errcatch");\r
 assert_checkequal(lasterror(), errmsg);\r
-errmsg=msprintf(_("Wrong type for ''%s'' property: Real matrix expected.\n"), "light_position");\r
-ierr = execstr("l.light_position = ''asd''", "errcatch");\r
+errmsg=msprintf(_("Wrong type for ''%s'' property: Real matrix expected.\n"), "position");\r
+ierr = execstr("l.position = ''asd''", "errcatch");\r
 assert_checkequal(lasterror(), errmsg);\r
-errmsg=msprintf(_("Wrong type for ''%s'' property: Real matrix expected.\n"), "light_direction");\r
-ierr = execstr("l.light_direction = ''asd''", "errcatch");\r
+errmsg=msprintf(_("Wrong type for ''%s'' property: Real matrix expected.\n"), "direction");\r
+ierr = execstr("l.direction = ''asd''", "errcatch");\r
 assert_checkequal(lasterror(), errmsg);\r
 errmsg=msprintf(_("Wrong type for ''%s'' property: String expected.\n"),  "light_type");\r
 ierr = execstr("l.light_type = 0", "errcatch");\r
@@ -69,11 +69,11 @@ assert_checkequal(lasterror(), errmsg);
 errmsg=msprintf(_("Wrong size for ''%s'' property: %d elements expected.\n"), "specular_color", 3);\r
 ierr = execstr("l.specular_color = [1 1]", "errcatch");\r
 assert_checkequal(lasterror(), errmsg);\r
-errmsg=msprintf(_("Wrong size for ''%s'' property: %d elements expected.\n"), "light_position", 3);\r
-ierr = execstr("l.light_position = [1 1]", "errcatch");\r
+errmsg=msprintf(_("Wrong size for ''%s'' property: %d elements expected.\n"), "position", 3);\r
+ierr = execstr("l.position = [1 1]", "errcatch");\r
 assert_checkequal(lasterror(), errmsg);\r
-errmsg=msprintf(_("Wrong size for ''%s'' property: %d elements expected.\n"), "light_direction", 3);\r
-ierr = execstr("l.light_direction = [1 1]", "errcatch");\r
+errmsg=msprintf(_("Wrong size for ''%s'' property: %d elements expected.\n"), "direction", 3);\r
+ierr = execstr("l.direction = [1 1]", "errcatch");\r
 assert_checkequal(lasterror(), errmsg);\r
 // check parameter bounds\r
 errmsg=msprintf(_("Wrong values for ''%s'' property: values between [0, 1] expected.\n"), "ambient_color");\r
index 2d69d33..f94cd6c 100644 (file)
@@ -45,8 +45,8 @@ assert_checkequal(l.parent.type, "Axes");
 assert_checkequal(l.children, []);\r
 assert_checkequal(l.visible, "off");\r
 assert_checkequal(l.light_type, "directional");\r
-assert_checktrue(l.light_position - [5 4 3] < 1d-7);\r
-assert_checktrue(l.light_direction - [2 1 0] < 1d-7);\r
+assert_checktrue(l.position - [5 4 3] < 1d-7);\r
+assert_checktrue(l.direction - [2 1 0] < 1d-7);\r
 assert_checktrue(l.ambient_color - [0.3 0.3 0.3] < 1d-7);\r
 assert_checktrue(l.diffuse_color - [0.2 0.2 0.2] < 1d-7);\r
 assert_checktrue(l.specular_color - [0.1 0.1 0.1] < 1d-7);\r
@@ -70,13 +70,13 @@ ierr = execstr("l.specular_color = ''asd''", "errcatch");
 assert_checkequal(lasterror(), errmsg);\r
 \r
 \r
-errmsg=msprintf(_("Wrong type for ''%s'' property: Real matrix expected.\n"), "light_position");\r
-ierr = execstr("l.light_position = ''asd''", "errcatch");\r
+errmsg=msprintf(_("Wrong type for ''%s'' property: Real matrix expected.\n"), "position");\r
+ierr = execstr("l.position = ''asd''", "errcatch");\r
 assert_checkequal(lasterror(), errmsg);\r
 \r
 \r
-errmsg=msprintf(_("Wrong type for ''%s'' property: Real matrix expected.\n"), "light_direction");\r
-ierr = execstr("l.light_direction = ''asd''", "errcatch");\r
+errmsg=msprintf(_("Wrong type for ''%s'' property: Real matrix expected.\n"), "direction");\r
+ierr = execstr("l.direction = ''asd''", "errcatch");\r
 assert_checkequal(lasterror(), errmsg);\r
 \r
 errmsg=msprintf(_("Wrong type for ''%s'' property: String expected.\n"),  "light_type");\r
@@ -97,12 +97,12 @@ errmsg=msprintf(_("Wrong size for ''%s'' property: %d elements expected.\n"), "s
 ierr = execstr("l.specular_color = [1 1]", "errcatch");\r
 assert_checkequal(lasterror(), errmsg);\r
 \r
-errmsg=msprintf(_("Wrong size for ''%s'' property: %d elements expected.\n"), "light_position", 3);\r
-ierr = execstr("l.light_position = [1 1]", "errcatch");\r
+errmsg=msprintf(_("Wrong size for ''%s'' property: %d elements expected.\n"), "position", 3);\r
+ierr = execstr("l.position = [1 1]", "errcatch");\r
 assert_checkequal(lasterror(), errmsg);\r
 \r
-errmsg=msprintf(_("Wrong size for ''%s'' property: %d elements expected.\n"), "light_direction", 3);\r
-ierr = execstr("l.light_direction = [1 1]", "errcatch");\r
+errmsg=msprintf(_("Wrong size for ''%s'' property: %d elements expected.\n"), "direction", 3);\r
+ierr = execstr("l.direction = [1 1]", "errcatch");\r
 assert_checkequal(lasterror(), errmsg);\r
 \r
 // check parameter bounds\r
index 0caedcc..980e0ee 100644 (file)
@@ -394,6 +394,7 @@ function [] = %_save(%__filename__, varargin)
         "color_flag", ...
         "data", ...
         "color_flag", ...
+        "use_color_material", ...
         "hiddencolor", ...
         "clip_state", ...
         "clip_box", ...
@@ -826,8 +827,8 @@ function [] = %_save(%__filename__, varargin)
         "type", ...
         "visible", ...
         "light_type", ...
-        "light_position", ...
-        "light_direction", ...
+        "position", ...
+        "direction", ...
         "ambient_color", ...
         "diffuse_color", ...
         "specular_color"]);