atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update next lutin version

Browse Source
This commit is contained in:
Edouard DUPIN 2015-09-24 21:44:04 +02:00
parent 9bba7de644
commit 0e2fbeffce
5 changed files with 84 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ewol/compositing/Text.cpp
View File

@ -347,10 +347,19 @@ vec3 ewol::compositing::Text::calculateSizeChar(const char32_t& _charcode) {
// get a pointer on the glyph property : // get a pointer on the glyph property :
ewol::GlyphProperty * myGlyph = getGlyphPointer(_charcode); ewol::GlyphProperty * myGlyph = getGlyphPointer(_charcode);
int32_t fontHeigh = getHeight(); int32_t fontHeigh = getHeight();
if (myGlyph == nullptr) {
if (m_font == nullptr) {
EWOL_WARNING("no Glyph... in no font");
} else {
EWOL_WARNING("no Glyph... in font : " << m_font->getName());
}
return vec3((float)(0.2),
(float)(fontHeigh),
(float)(0.0));
}
// get the kerning ofset : // get the kerning ofset :
float kerningOffset = 0.0; float kerningOffset = 0.0;
if (true == m_kerning) { if (m_kerning == true) {
kerningOffset = myGlyph->kerningGet(m_previousCharcode); kerningOffset = myGlyph->kerningGet(m_previousCharcode);
} }

78
lutin_ewol.py
View File

@ -13,18 +13,18 @@ def get_license():
def create(target): def create(target):
# module name is 'edn' and type binary. # module name is 'edn' and type binary.
myModule = module.Module(__file__, 'ewol', 'LIBRARY') my_module = module.Module(__file__, 'ewol', 'LIBRARY')
# add extra compilation flags: # add extra compilation flags:
myModule.add_extra_compile_flags() my_module.add_extra_compile_flags()
# add the file to compile: # add the file to compile:
myModule.add_src_file([ my_module.add_src_file([
'ewol/ewol.cpp', 'ewol/ewol.cpp',
'ewol/debug.cpp', 'ewol/debug.cpp',
'ewol/Padding.cpp', 'ewol/Padding.cpp',
'ewol/translate.cpp' 'ewol/translate.cpp'
]) ])
myModule.add_header_file([ my_module.add_header_file([
'ewol/debug.h', # TODO : Remove this ... 'ewol/debug.h', # TODO : Remove this ...
'ewol/ewol.h', 'ewol/ewol.h',
'ewol/Padding.h', 'ewol/Padding.h',
@ -32,7 +32,7 @@ def create(target):
]) ])
# compositing: # compositing:
myModule.add_src_file([ my_module.add_src_file([
'ewol/compositing/Compositing.cpp', 'ewol/compositing/Compositing.cpp',
'ewol/compositing/TextBase.cpp', 'ewol/compositing/TextBase.cpp',
'ewol/compositing/Text.cpp', 'ewol/compositing/Text.cpp',
@ -43,7 +43,7 @@ def create(target):
'ewol/compositing/Shaper.cpp', 'ewol/compositing/Shaper.cpp',
'ewol/compositing/Area.cpp' 'ewol/compositing/Area.cpp'
]) ])
myModule.add_header_file([ my_module.add_header_file([
'ewol/compositing/Text.h', 'ewol/compositing/Text.h',
'ewol/compositing/Drawing.h', 'ewol/compositing/Drawing.h',
'ewol/compositing/Sprite.h', 'ewol/compositing/Sprite.h',
@ -56,12 +56,12 @@ def create(target):
]) ])
# context: # context:
myModule.add_src_file([ my_module.add_src_file([
'ewol/context/ConfigFont.cpp', 'ewol/context/ConfigFont.cpp',
'ewol/context/Context.cpp', 'ewol/context/Context.cpp',
'ewol/context/InputManager.cpp' 'ewol/context/InputManager.cpp'
]) ])
myModule.add_header_file([ my_module.add_header_file([
'ewol/context/ConfigFont.h', 'ewol/context/ConfigFont.h',
'ewol/context/Context.h', 'ewol/context/Context.h',
'ewol/context/Application.h', 'ewol/context/Application.h',
@ -69,35 +69,35 @@ def create(target):
]) ])
# event properties: # event properties:
myModule.add_src_file([ my_module.add_src_file([
'ewol/event/Entry.cpp', 'ewol/event/Entry.cpp',
'ewol/event/Time.cpp', 'ewol/event/Time.cpp',
'ewol/event/Input.cpp' 'ewol/event/Input.cpp'
]) ])
myModule.add_header_file([ my_module.add_header_file([
'ewol/event/Time.h', 'ewol/event/Time.h',
'ewol/event/Input.h', 'ewol/event/Input.h',
'ewol/event/Entry.h' 'ewol/event/Entry.h'
]) ])
# object: # object:
myModule.add_src_file([ my_module.add_src_file([
'ewol/object/Manager.cpp', 'ewol/object/Manager.cpp',
'ewol/object/Object.cpp', 'ewol/object/Object.cpp',
'ewol/object/Worker.cpp' 'ewol/object/Worker.cpp'
]) ])
myModule.add_header_file([ my_module.add_header_file([
'ewol/object/Worker.h', 'ewol/object/Worker.h',
'ewol/object/Manager.h', 'ewol/object/Manager.h',
'ewol/object/Object.h' 'ewol/object/Object.h'
]) ])
# parameter: # parameter:
myModule.add_src_file([ my_module.add_src_file([
'ewol/parameter/Parameter.cpp', 'ewol/parameter/Parameter.cpp',
'ewol/parameter/Interface.cpp', 'ewol/parameter/Interface.cpp',
]) ])
myModule.add_header_file([ my_module.add_header_file([
'ewol/parameter/Value.h', 'ewol/parameter/Value.h',
'ewol/parameter/Interface.h', 'ewol/parameter/Interface.h',
'ewol/parameter/Parameter.h', 'ewol/parameter/Parameter.h',
@ -106,18 +106,18 @@ def create(target):
]) ])
# Signal: # Signal:
myModule.add_src_file([ my_module.add_src_file([
'ewol/signal/Interface.cpp', 'ewol/signal/Interface.cpp',
'ewol/signal/Base.cpp' 'ewol/signal/Base.cpp'
]) ])
myModule.add_header_file([ my_module.add_header_file([
'ewol/signal/Interface.h', 'ewol/signal/Interface.h',
'ewol/signal/Base.h', 'ewol/signal/Base.h',
'ewol/signal/Signal.h' 'ewol/signal/Signal.h'
]) ])
# resources: # resources:
myModule.add_src_file([ my_module.add_src_file([
'ewol/resource/Colored3DObject.cpp', 'ewol/resource/Colored3DObject.cpp',
'ewol/resource/ColorFile.cpp', 'ewol/resource/ColorFile.cpp',
'ewol/resource/ConfigFile.cpp', 'ewol/resource/ConfigFile.cpp',
@ -128,7 +128,7 @@ def create(target):
'ewol/resource/TexturedFont.cpp', 'ewol/resource/TexturedFont.cpp',
'ewol/resource/DistanceFieldFont.cpp' 'ewol/resource/DistanceFieldFont.cpp'
]) ])
myModule.add_header_file([ my_module.add_header_file([
'ewol/resource/FontFreeType.h', 'ewol/resource/FontFreeType.h',
'ewol/resource/TexturedFont.h', 'ewol/resource/TexturedFont.h',
'ewol/resource/ColorFile.h', 'ewol/resource/ColorFile.h',
@ -144,7 +144,7 @@ def create(target):
]) ])
# widget: # widget:
myModule.add_src_file([ my_module.add_src_file([
'ewol/widget/ButtonColor.cpp', 'ewol/widget/ButtonColor.cpp',
'ewol/widget/Button.cpp', 'ewol/widget/Button.cpp',
'ewol/widget/CheckBox.cpp', 'ewol/widget/CheckBox.cpp',
@ -180,7 +180,7 @@ def create(target):
'ewol/widget/Windows.cpp', 'ewol/widget/Windows.cpp',
'ewol/widget/WSlider.cpp', 'ewol/widget/WSlider.cpp',
]) ])
myModule.add_header_file([ my_module.add_header_file([
'ewol/widget/Menu.h', 'ewol/widget/Menu.h',
'ewol/widget/Slider.h', 'ewol/widget/Slider.h',
'ewol/widget/WidgetScrolled.h', 'ewol/widget/WidgetScrolled.h',
@ -218,32 +218,32 @@ def create(target):
'ewol/widget/List.h' 'ewol/widget/List.h'
]) ])
myModule.copy_path('data/theme/shape/square/*','theme/shape/square') my_module.copy_path('data/theme/shape/square/*','theme/shape/square')
myModule.copy_path('data/theme/shape/round/*','theme/shape/round') my_module.copy_path('data/theme/shape/round/*','theme/shape/round')
myModule.copy_path('data/theme/color/black/*','theme/color/black') my_module.copy_path('data/theme/color/black/*','theme/color/black')
myModule.copy_path('data/theme/color/white/*','theme/color/white') my_module.copy_path('data/theme/color/white/*','theme/color/white')
myModule.copy_path('data/textured.*','') my_module.copy_path('data/textured.*','')
myModule.copy_path('data/texturedNoMaterial.*','') my_module.copy_path('data/texturedNoMaterial.*','')
myModule.copy_path('data/text.*','') my_module.copy_path('data/text.*','')
myModule.copy_path('data/simple3D.*','') my_module.copy_path('data/simple3D.*','')
myModule.copy_path('data/color.*','') my_module.copy_path('data/color.*','')
myModule.copy_path('data/color3.*','') my_module.copy_path('data/color3.*','')
myModule.copy_path('data/textured3D2.*','') my_module.copy_path('data/textured3D2.*','')
myModule.copy_path('data/textured3D.*','') my_module.copy_path('data/textured3D.*','')
myModule.copy_path('data/texturedDF.*','') my_module.copy_path('data/texturedDF.*','')
myModule.copy_path('data/fontDistanceField/*','fontDistanceField') my_module.copy_path('data/fontDistanceField/*','fontDistanceField')
myModule.copy_path('data/translate/*','translate/ewol') my_module.copy_path('data/translate/*','translate/ewol')
# name of the dependency # name of the dependency
myModule.add_module_depend(['etk', 'gale', 'freetype', 'exml', 'ejson', 'egami', 'edtaa3']) my_module.add_module_depend(['etk', 'gale', 'freetype', 'exml', 'ejson', 'egami', 'edtaa3'])
myModule.add_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__))
tagFile = tools.get_current_path(__file__) + "/tag" tagFile = tools.get_current_path(__file__) + "/tag"
ewolVersionID = tools.file_read_data(tagFile) ewolVersionID = tools.file_read_data(tagFile)
myModule.compile_flags('c++', [ my_module.compile_flags('c++', [
"-DEWOL_VERSION=\"\\\""+ewolVersionID+"\\\"\"" "-DEWOL_VERSION=\"\\\""+ewolVersionID+"\\\"\""
]) ])
return myModule return my_module

14
sample/001_HelloWord/lutin_001_HelloWord.py
View File

@ -10,22 +10,22 @@ def get_desc():
# Module creation instance (not optionnal) # Module creation instance (not optionnal)
def create(target): def create(target):
# module name is '001_HelloWord' and type binary. # module name is '001_HelloWord' and type binary.
myModule = module.Module(__file__, '001_HelloWord', 'BINARY') my_module = module.Module(__file__, '001_HelloWord', 'BINARY')
# add the file to compile: # add the file to compile:
myModule.add_src_file([ my_module.add_src_file([
'appl/Main.cpp', 'appl/Main.cpp',
'appl/debug.cpp', 'appl/debug.cpp',
'appl/Windows.cpp', 'appl/Windows.cpp',
]) ])
# add Library dependency name # add Library dependency name
myModule.add_module_depend(['ewol']) my_module.add_module_depend(['ewol'])
# add application C flags # add application C flags
myModule.compile_flags('c++', [ my_module.compile_flags('c++', [
"-DPROJECT_NAME=\"\\\""+myModule.name+"\\\"\""]) "-DPROJECT_NAME=\"\\\""+my_module.name+"\\\"\""])
# Add current include Path # Add current include Path
myModule.add_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__))
# return the created module # return the created module
return myModule return my_module

14
sample/0XX_CustomWidgets/lutin_0XX_customwidget.py
View File

@ -10,9 +10,9 @@ def get_desc():
# Module creation instance (not optionnal) # Module creation instance (not optionnal)
def create(target): def create(target):
# module name is '001_HelloWord' and type binary. # module name is '001_HelloWord' and type binary.
myModule = module.Module(__file__, '0XX_customwidget', 'BINARY') my_module = module.Module(__file__, '0XX_customwidget', 'BINARY')
# add the file to compile: # add the file to compile:
myModule.add_src_file([ my_module.add_src_file([
'appl/Main.cpp', 'appl/Main.cpp',
'appl/debug.cpp', 'appl/debug.cpp',
'appl/Windows.cpp', 'appl/Windows.cpp',
@ -20,14 +20,14 @@ def create(target):
]) ])
# add Library dependency name # add Library dependency name
myModule.add_module_depend(['ewol']) my_module.add_module_depend(['ewol'])
# add application C flags # add application C flags
myModule.compile_flags('c++', [ my_module.compile_flags('c++', [
"-DPROJECT_NAME=\"\\\""+myModule.name+"\\\"\""]) "-DPROJECT_NAME=\"\\\""+my_module.name+"\\\"\""])
# Add current include Path # Add current include Path
myModule.add_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__))
# return the created module # return the created module
return myModule return my_module

40
sample/examplewallpaper/lutin_examplewallpaper.py
View File

@ -9,52 +9,52 @@ def get_desc():
def create(target): def create(target):
# module name is 'edn' and type binary. # module name is 'edn' and type binary.
myModule = module.Module(__file__, 'examplewallpaper', 'PACKAGE') my_module = module.Module(__file__, 'examplewallpaper', 'PACKAGE')
# add the file to compile: # add the file to compile:
myModule.add_src_file([ my_module.add_src_file([
'appl/Main.cpp', 'appl/Main.cpp',
'appl/debug.cpp', 'appl/debug.cpp',
'appl/WidgetDisplay.cpp', 'appl/WidgetDisplay.cpp',
'appl/Windows.cpp', 'appl/Windows.cpp',
]) ])
myModule.add_module_depend(['ewol']) my_module.add_module_depend(['ewol'])
myModule.compile_flags('c++', [ my_module.compile_flags('c++', [
"-DPROJECT_NAME=\"\\\""+myModule.name+"\\\"\""]) "-DPROJECT_NAME=\"\\\""+my_module.name+"\\\"\""])
myModule.copy_path('data/SnowFlake.svg','') my_module.copy_path('data/SnowFlake.svg','')
myModule.add_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__))
now = datetime.datetime.now() now = datetime.datetime.now()
versionID=str(now.year-2013)+"."+str(now.month)+"."+str(now.day) versionID=str(now.year-2013)+"."+str(now.month)+"."+str(now.day)
# set the package properties : # set the package properties :
myModule.pkg_set("VERSION", versionID) my_module.pkg_set("VERSION", versionID)
myModule.pkg_set("COMPAGNY_TYPE", "org") my_module.pkg_set("COMPAGNY_TYPE", "org")
myModule.pkg_set("COMPAGNY_NAME", "EWOL") my_module.pkg_set("COMPAGNY_NAME", "EWOL")
myModule.pkg_set("MAINTAINER", ["Mr DUPIN Edouard <yui.heero@gmail.com>"]) my_module.pkg_set("MAINTAINER", ["Mr DUPIN Edouard <yui.heero@gmail.com>"])
myModule.pkg_set("ICON", tools.get_current_path(__file__) + "/../data/icon.png") my_module.pkg_set("ICON", tools.get_current_path(__file__) + "/../data/icon.png")
myModule.pkg_set("SECTION", "example") my_module.pkg_set("SECTION", "example")
myModule.pkg_set("PRIORITY", "extra") my_module.pkg_set("PRIORITY", "extra")
myModule.pkg_set("DESCRIPTION", "EWOL example for Wallpaper on Android") my_module.pkg_set("DESCRIPTION", "EWOL example for Wallpaper on Android")
myModule.pkg_set("NAME", "ewol Wallpaper ewample") my_module.pkg_set("NAME", "ewol Wallpaper ewample")
myModule.pkg_set("ANDROID_APPL_TYPE", "WALLPAPER") my_module.pkg_set("ANDROID_APPL_TYPE", "WALLPAPER")
#for the exemple : #for the exemple :
myModule.pkg_add("ANDROID_WALLPAPER_PROPERTIES", ["list", "testpattern", "Select test pattern", "Choose which test pattern to display", \ my_module.pkg_add("ANDROID_WALLPAPER_PROPERTIES", ["list", "testpattern", "Select test pattern", "Choose which test pattern to display", \
[ ["key","value display"],\ [ ["key","value display"],\
["key2","value display 2"]\ ["key2","value display 2"]\
] \ ] \
]) ])
myModule.pkg_add("ANDROID_WALLPAPER_PROPERTIES", ["bool", "movement", "Motion", "Apply movement to test pattern", ["Moving test pattern", "Still test pattern"]]) my_module.pkg_add("ANDROID_WALLPAPER_PROPERTIES", ["bool", "movement", "Motion", "Apply movement to test pattern", ["Moving test pattern", "Still test pattern"]])
# add the currrent module at the # add the currrent module at the
return myModule return my_module