2009-09-16 12:43:58 -04:00
|
|
|
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
2008-11-07 14:32:28 -05:00
|
|
|
|
|
|
|
UNIT_TESTS = \
|
2011-09-27 12:50:51 -04:00
|
|
|
test-texture-slicing.c \
|
2009-03-11 14:26:30 -04:00
|
|
|
test-texture-async.c \
|
2010-09-02 09:48:30 -04:00
|
|
|
test-texture-material.c \
|
2008-11-07 14:32:28 -05:00
|
|
|
test-events.c \
|
|
|
|
test-scale.c \
|
|
|
|
test-actors.c \
|
2010-12-16 10:30:53 -05:00
|
|
|
test-shader-effects.c \
|
2008-11-07 14:32:28 -05:00
|
|
|
test-depth.c \
|
|
|
|
test-threads.c \
|
|
|
|
test-script.c \
|
|
|
|
test-grab.c \
|
2010-08-05 10:20:49 -04:00
|
|
|
test-cogl-shader-arbfp.c \
|
2010-08-05 10:18:39 -04:00
|
|
|
test-cogl-shader-glsl.c \
|
2010-02-05 07:32:00 -05:00
|
|
|
test-animator.c \
|
2010-05-11 10:04:34 -04:00
|
|
|
test-state.c \
|
|
|
|
test-state-animator.c \
|
2008-12-19 16:31:18 -05:00
|
|
|
test-fbo.c \
|
2008-11-07 14:32:28 -05:00
|
|
|
test-multistage.c \
|
|
|
|
test-cogl-primitives.c \
|
|
|
|
test-cogl-tex-tile.c \
|
|
|
|
test-cogl-tex-convert.c \
|
|
|
|
test-cogl-tex-foreign.c \
|
|
|
|
test-cogl-tex-getset.c \
|
|
|
|
test-cogl-offscreen.c \
|
|
|
|
test-cogl-tex-polygon.c \
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 11:15:40 -05:00
|
|
|
test-cogl-multitexture.c \
|
2008-11-07 14:32:28 -05:00
|
|
|
test-stage-read-pixels.c \
|
|
|
|
test-clip.c \
|
|
|
|
test-paint-wrapper.c \
|
|
|
|
test-texture-quality.c \
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 04:50:03 -05:00
|
|
|
test-layout.c \
|
|
|
|
test-animation.c \
|
2008-12-08 08:57:10 -05:00
|
|
|
test-easing.c \
|
2008-12-11 06:12:48 -05:00
|
|
|
test-binding-pool.c \
|
2009-01-06 19:27:50 -05:00
|
|
|
test-text.c \
|
2009-01-08 13:54:48 -05:00
|
|
|
test-text-field.c \
|
2011-07-26 07:40:52 -04:00
|
|
|
test-cairo-clock.c \
|
2010-10-15 12:35:41 -04:00
|
|
|
test-cairo-flowers.c \
|
2009-09-11 10:34:13 -04:00
|
|
|
test-cogl-vertex-buffer.c \
|
2009-10-07 06:42:09 -04:00
|
|
|
test-bin-layout.c \
|
2009-10-13 07:14:05 -04:00
|
|
|
test-flow-layout.c \
|
2010-02-16 10:39:08 -05:00
|
|
|
test-box-layout.c \
|
2010-05-12 07:00:33 -04:00
|
|
|
test-stage-sizing.c \
|
2010-05-19 07:27:09 -04:00
|
|
|
test-drag.c \
|
2010-05-26 10:58:15 -04:00
|
|
|
test-constraints.c \
|
2010-06-28 12:18:35 -04:00
|
|
|
test-scrolling.c \
|
2011-03-09 04:06:44 -05:00
|
|
|
test-swipe-action.c \
|
2010-03-18 12:02:31 -04:00
|
|
|
test-cogl-point-sprites.c \
|
2010-10-25 10:47:15 -04:00
|
|
|
test-table-layout.c \
|
2010-11-10 11:37:34 -05:00
|
|
|
test-path-constraint.c \
|
2011-02-07 08:57:16 -05:00
|
|
|
test-snap-constraint.c \
|
2011-06-17 11:54:31 -04:00
|
|
|
test-state-script.c \
|
2011-10-17 11:06:15 -04:00
|
|
|
test-drop.c \
|
2011-12-20 09:47:35 -05:00
|
|
|
test-devices.c \
|
|
|
|
test-actor.c
|
2008-11-07 14:32:28 -05:00
|
|
|
|
2008-11-15 10:03:09 -05:00
|
|
|
if X11_TESTS
|
2011-10-17 11:06:15 -04:00
|
|
|
UNIT_TESTS += test-pixmap.c
|
2008-11-15 10:03:09 -05:00
|
|
|
endif
|
|
|
|
|
2011-03-25 07:49:44 -04:00
|
|
|
if OS_WIN32
|
|
|
|
SHEXT =
|
|
|
|
else
|
|
|
|
SHEXT = $(EXEEXT)
|
|
|
|
endif
|
|
|
|
|
2008-11-07 14:32:28 -05:00
|
|
|
# For convenience, this provides a way to easily run individual unit tests:
|
2011-11-18 10:12:45 -05:00
|
|
|
wrappers: stamp-test-interactive $(top_builddir)/build/win32/test-interactive-clutter.bat
|
2009-11-05 12:30:33 -05:00
|
|
|
@true
|
2011-11-18 11:38:45 -05:00
|
|
|
|
2011-09-27 12:40:51 -04:00
|
|
|
stamp-test-interactive: Makefile
|
2010-06-06 17:47:02 -04:00
|
|
|
@wrapper=$(abs_builddir)/wrapper.sh ; \
|
|
|
|
chmod +x $$wrapper && \
|
2010-08-13 13:31:44 -04:00
|
|
|
( echo "/stamp-test-interactive" ; \
|
2011-09-27 12:40:51 -04:00
|
|
|
echo "/stamp-test-unit-names" ; \
|
2010-08-13 13:31:44 -04:00
|
|
|
echo "/test-interactive" ; \
|
2011-09-27 12:40:51 -04:00
|
|
|
echo "/test-unit-names.h" ; \
|
2010-08-13 13:31:44 -04:00
|
|
|
echo "*.o" ; \
|
|
|
|
echo ".gitignore" ) > .gitignore ; \
|
2009-11-25 07:25:14 -05:00
|
|
|
for i in $(UNIT_TESTS); \
|
2009-11-05 12:30:33 -05:00
|
|
|
do \
|
|
|
|
test_bin=$${i%*.c} ; \
|
|
|
|
echo " GEN $$test_bin" ; \
|
|
|
|
( echo "#!/bin/sh" ; \
|
2009-11-25 07:25:14 -05:00
|
|
|
echo "$$wrapper $$test_bin \$$@" \
|
2011-03-25 07:49:44 -04:00
|
|
|
) > $$test_bin$(SHEXT) ; \
|
|
|
|
chmod +x $$test_bin$(SHEXT) ; \
|
|
|
|
echo "/$$test_bin$(SHEXT)" >> .gitignore ; \
|
2009-11-05 12:30:33 -05:00
|
|
|
done \
|
|
|
|
&& echo timestamp > $(@F)
|
|
|
|
|
2011-11-18 10:12:45 -05:00
|
|
|
$(top_builddir)/build/win32/test-interactive-clutter.bat: Makefile test-interactive$(EXEEXT)
|
|
|
|
@echo " GEN test-interactive-clutter.bat" ; \
|
2011-09-16 05:25:47 -04:00
|
|
|
for i in $(UNIT_TESTS); \
|
|
|
|
do \
|
|
|
|
case $$i in \
|
|
|
|
test-pixmap.c|test-devices.c) ;; \
|
|
|
|
*.c) test_bin=$${i%*.c} \
|
|
|
|
;; \
|
|
|
|
esac; \
|
2011-11-15 03:19:06 -05:00
|
|
|
( echo "test-interactive-clutter $$test_bin" ) > $$test_bin-clutter.bat ; \
|
|
|
|
( echo "test-interactive-clutter $$test_bin" ) >> test-interactive-clutter.bat ; \
|
2011-09-16 05:25:47 -04:00
|
|
|
done \
|
2011-11-18 12:08:01 -05:00
|
|
|
&& mv -f *.bat $(top_builddir)/build/win32/
|
2011-11-18 11:38:45 -05:00
|
|
|
|
2011-11-18 10:12:45 -05:00
|
|
|
$(top_builddir)/build/win32/test-unit-names.h: test-unit-names.h
|
2011-11-18 12:08:01 -05:00
|
|
|
@echo " CP "; cp test-unit-names.h $(top_builddir)/build/win32/
|
2011-09-16 05:25:47 -04:00
|
|
|
|
2011-09-27 12:40:51 -04:00
|
|
|
test-unit-names.h: stamp-test-unit-names
|
|
|
|
@true
|
|
|
|
|
|
|
|
stamp-test-unit-names: Makefile
|
|
|
|
@( echo "/* ** This file is autogenerated. Do not edit. ** */" ; \
|
|
|
|
echo "" ; \
|
|
|
|
echo "const char *test_unit_names[] = {" ) > test-unit-names.h ; \
|
|
|
|
for i in $(UNIT_TESTS); \
|
|
|
|
do \
|
|
|
|
test_bin=$${i%*.c} ; \
|
|
|
|
echo " \"$$test_bin\"," >> test-unit-names.h ; \
|
|
|
|
done \
|
|
|
|
&& echo "};" >> test-unit-names.h \
|
|
|
|
&& echo timestamp > $(@F)
|
|
|
|
|
2009-11-05 12:30:33 -05:00
|
|
|
clean-wrappers:
|
|
|
|
@for i in $(UNIT_TESTS); \
|
2008-11-07 14:32:28 -05:00
|
|
|
do \
|
2009-11-05 12:30:33 -05:00
|
|
|
test_bin=$${i%*.c} ; \
|
|
|
|
echo " RM $$test_bin"; \
|
2011-03-25 07:49:44 -04:00
|
|
|
rm -f $$test_bin$(SHEXT); \
|
2009-11-05 12:30:33 -05:00
|
|
|
done \
|
2011-11-18 12:08:01 -05:00
|
|
|
&& rm -f $(top_builddir)/build/win32/*.bat \
|
2011-11-22 07:11:06 -05:00
|
|
|
&& rm -f stamp-test-unit-names \
|
2009-11-05 12:30:33 -05:00
|
|
|
&& rm -f stamp-test-interactive
|
2008-11-08 10:56:22 -05:00
|
|
|
|
2009-11-05 12:30:33 -05:00
|
|
|
.PHONY: wrappers clean-wrappers
|
2008-11-07 14:32:28 -05:00
|
|
|
|
2009-06-15 05:48:56 -04:00
|
|
|
INCLUDES = \
|
2009-11-05 12:30:33 -05:00
|
|
|
-I$(top_srcdir) \
|
|
|
|
-I$(top_srcdir)/clutter \
|
2011-11-18 10:12:45 -05:00
|
|
|
-I$(top_builddir)/clutter
|
2009-06-15 05:48:56 -04:00
|
|
|
|
2011-09-21 13:05:03 -04:00
|
|
|
common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la
|
2008-11-07 14:32:28 -05:00
|
|
|
|
|
|
|
noinst_PROGRAMS = test-interactive
|
|
|
|
|
2011-09-27 12:40:51 -04:00
|
|
|
test_interactive_SOURCES = test-main.c test-unit-names.h $(UNIT_TESTS)
|
2009-11-05 12:30:33 -05:00
|
|
|
test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
|
|
|
|
test_interactive_CPPFLAGS = \
|
2010-06-06 17:47:02 -04:00
|
|
|
-DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \
|
2010-09-10 08:41:49 -04:00
|
|
|
-DG_DISABLE_SINGLE_INCLUDES \
|
2011-10-13 12:50:25 -04:00
|
|
|
-DGLIB_DISABLE_DEPRECATION_WARNINGS \
|
|
|
|
-DCLUTTER_DISABLE_DEPRECATION_WARNINGS
|
2008-11-07 14:32:28 -05:00
|
|
|
test_interactive_LDFLAGS = -export-dynamic
|
2011-08-27 18:58:26 -04:00
|
|
|
test_interactive_LDADD = $(CLUTTER_LIBS) $(common_ldadd) -lm
|
2009-08-03 09:53:46 -04:00
|
|
|
|
2011-11-18 12:08:01 -05:00
|
|
|
EXTRA_DIST = \
|
|
|
|
wrapper.sh.in \
|
|
|
|
$(top_builddir)/build/win32/test-unit-names.h
|
|
|
|
|
2011-09-27 12:40:51 -04:00
|
|
|
DISTCLEANFILES = wrapper.sh .gitignore test-unit-names.h
|
2010-08-15 13:42:54 -04:00
|
|
|
|
2011-11-18 07:39:06 -05:00
|
|
|
BUILT_SOURCES = test-unit-names.h wrappers
|
2009-11-05 12:30:33 -05:00
|
|
|
|
2011-11-18 12:08:01 -05:00
|
|
|
dist-hook: $(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj $(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj $(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters
|
2011-09-16 05:25:47 -04:00
|
|
|
|
2011-11-18 10:12:45 -05:00
|
|
|
$(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj: $(top_srcdir)/build/win32/vs9/test-interactive-clutter.vcprojin
|
2011-09-16 05:25:47 -04:00
|
|
|
for F in $(test_interactive_SOURCES); do \
|
|
|
|
case $$F in \
|
|
|
|
test-pixmap.c|test-devices.c) ;; \
|
|
|
|
*.c) echo ' <File RelativePath="..\..\..\tests\interactive\'$$F'" />' \
|
|
|
|
;; \
|
|
|
|
esac; \
|
2011-11-22 07:11:06 -05:00
|
|
|
done > testinteractive.sourcefiles
|
2011-10-20 04:35:38 -04:00
|
|
|
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-interactive-clutter.vcprojin >$@
|
2011-11-22 07:11:06 -05:00
|
|
|
rm -f testinteractive.sourcefiles
|
2011-11-18 11:38:45 -05:00
|
|
|
|
2011-11-18 10:12:45 -05:00
|
|
|
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin
|
2011-09-16 05:25:47 -04:00
|
|
|
for F in $(test_interactive_SOURCES); do \
|
|
|
|
case $$F in \
|
|
|
|
test-pixmap.c|test-devices.c) ;; \
|
|
|
|
*.c) echo ' <ClCompile Include="..\..\..\tests\interactive\'$$F'" />' \
|
|
|
|
;; \
|
|
|
|
esac; \
|
2011-11-22 07:11:06 -05:00
|
|
|
done > testinteractive.vs10.sourcefiles
|
2011-10-20 04:35:38 -04:00
|
|
|
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin >$@
|
2011-11-22 07:11:06 -05:00
|
|
|
rm -f testinteractive.vs10.sourcefiles
|
2011-11-18 11:38:45 -05:00
|
|
|
|
2011-11-18 10:12:45 -05:00
|
|
|
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin
|
2011-09-16 05:25:47 -04:00
|
|
|
for F in $(test_interactive_SOURCES); do \
|
|
|
|
case $$F in \
|
|
|
|
test-pixmap.c|test-devices.c) ;; \
|
|
|
|
*.c) echo ' <ClCompile Include="..\..\..\tests\interactive\'$$F'"><Filter>Sources</Filter></ClCompile>' \
|
|
|
|
;; \
|
|
|
|
esac; \
|
2011-11-22 07:11:06 -05:00
|
|
|
done > testinteractive.vs10.sourcefiles.filters
|
2011-10-20 04:35:38 -04:00
|
|
|
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin >$@
|
2011-11-22 07:11:06 -05:00
|
|
|
rm -f testinteractive.vs10.sourcefiles.filters
|
2011-09-16 05:25:47 -04:00
|
|
|
|
|
|
|
# Let the VS9/VS10 Project files be cleared out before they are re-expanded...
|
2011-11-22 07:11:06 -05:00
|
|
|
DISTCLEANFILES += \
|
|
|
|
$(top_builddir)/build/win32/test-unit-names.h \
|
|
|
|
$(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj \
|
|
|
|
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj \
|
|
|
|
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters
|
|
|
|
|
2011-11-18 12:08:01 -05:00
|
|
|
EXTRA_DIST += \
|
2011-11-22 07:11:06 -05:00
|
|
|
$(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj \
|
|
|
|
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj \
|
2011-11-18 12:08:01 -05:00
|
|
|
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters
|
2011-09-16 05:25:47 -04:00
|
|
|
|
2009-11-05 12:30:33 -05:00
|
|
|
clean-local: clean-wrappers
|