diff --git a/.gitignore b/.gitignore index b08d134..a01c9de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ +__pycache__ +.bck +out +target +build ################################### # folders diff --git a/GLD_ege.json b/GLD_ege.json new file mode 100644 index 0000000..bf168ed --- /dev/null +++ b/GLD_ege.json @@ -0,0 +1,133 @@ +{ + "type":"LIBRARY", + "group-id":"com.atria-soft", + "description":"Ewol Game engine", + "license":"MPL-2", + "license-file":"file://LICENCE.txt", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + "code-quality":"MEDIUM", + + "source": [ + "ege/debug.cpp", + "ege/Engine.cpp", + "ege/Component.cpp", + "ege/Environement.cpp", + "ege/camera/Camera.cpp", + "ege/camera/View.cpp", + "ege/camera/FPS.cpp", + "ege/camera/ControlBase.cpp", + "ege/position/Component.cpp", + "ege/physics/Component.cpp", + "ege/physics/Engine.cpp", + "ege/Entity.cpp", + "ege/particule/Component.cpp", + "ege/particule/Engine.cpp", + "ege/particule/Simple.cpp", + "ege/ia/Component.cpp", + "ege/ia/ComponentLua.cpp", + "ege/ia/Engine.cpp", + "ege/render/Component.cpp", + "ege/render/Engine.cpp", + "ege/widget/Mesh.cpp", + "ege/widget/Scene.cpp", + "ege/resource/Mesh.cpp", + "ege/resource/MeshEmf.cpp", + "ege/resource/MeshGird.cpp", + "ege/resource/MeshCube.cpp", + "ege/resource/MeshSphere.cpp", + "ege/resource/MeshCylinder.cpp", + "ege/resource/MeshCapsule.cpp", + "ege/resource/MeshCone.cpp", + "ege/resource/MeshObj.cpp", + "ege/resource/ParticuleMesh.cpp", + "ege/resource/tools/icoSphere.cpp", + "ege/resource/tools/isoSphere.cpp", + "ege/resource/tools/viewBox.cpp", + "ege/Light.cpp", + "ege/Material.cpp", + "ege/physics/shape/Shape.cpp", + "ege/physics/shape/Box.cpp", + "ege/physics/shape/Capsule.cpp", + "ege/physics/shape/Cone.cpp", + "ege/physics/shape/ConvexHull.cpp", + "ege/physics/shape/Cylinder.cpp", + "ege/physics/shape/Sphere.cpp", + "ege/physics/shape/Concave.cpp", + "ege/Ray.cpp" + ], + "header": [ + "ege/debug.hpp", + "ege/Engine.hpp", + "ege/Component.hpp", + "ege/Environement.hpp", + "ege/camera/Camera.hpp", + "ege/camera/View.hpp", + "ege/camera/FPS.hpp", + "ege/camera/ControlBase.hpp", + "ege/position/Component.hpp", + "ege/physics/Engine.hpp", + "ege/physics/Component.hpp", + "ege/Entity.hpp", + "ege/particule/Component.hpp", + "ege/particule/Engine.hpp", + "ege/particule/Simple.hpp", + "ege/ia/Component.hpp", + "ege/ia/ComponentLua.hpp", + "ege/ia/Engine.hpp", + "ege/render/Component.hpp", + "ege/render/Engine.hpp", + "ege/widget/Mesh.hpp", + "ege/widget/Scene.hpp", + "ege/resource/Mesh.hpp", + "ege/resource/ParticuleMesh.hpp", + "ege/resource/tools/icoSphere.hpp", + "ege/resource/tools/isoSphere.hpp", + "ege/resource/tools/viewBox.hpp", + "ege/resource/tools/Face.hpp", + "ege/resource/tools/FaceIndexing.hpp", + "ege/Light.hpp", + "ege/Material.hpp", + "ege/physics/shape/Shape.hpp", + "ege/physics/shape/Box.hpp", + "ege/physics/shape/Capsule.hpp", + "ege/physics/shape/Cone.hpp", + "ege/physics/shape/ConvexHull.hpp", + "ege/physics/shape/Cylinder.hpp", + "ege/physics/shape/Sphere.hpp", + "ege/physics/shape/Concave.hpp", + "ege/Ray.hpp" + ], + "path":[ + "." + ], + "compilation-version": { + "language": "c++", + "version": 2017 + }, + "dependency": [ + "ewol", + "ephysics", + "eproperty", + "echrono", + "luaWrapper" + ], + "copy": [ + { + "path":"data/ParticuleMesh.*" + },{ + "path":"data/material.*" + } + ], + "flag": [ + { + "language": "c++", + "value": [ + "-Wno-write-strings", + "-Wmissing-field-initializers", + "-Wall" + ] + } + ] +} \ No newline at end of file diff --git a/blender/io_scene_emf/__init__.py b/blender/io_scene_emf/__init__.py index 775deef..c343177 100644 --- a/blender/io_scene_emf/__init__.py +++ b/blender/io_scene_emf/__init__.py @@ -2,15 +2,11 @@ bl_info = { - "name": "Ewol Mesh file format emf", + "name": "EGE Mesh file format emf", "author": "Edouard DUPIN", - "blender": (2, 53, 0), + "blender": (2, 80, 0), "location": "File > Import-Export", "description": "Import-Export emf, Import EMF mesh, UV's, materials and textures", - "warning": "", - "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Import-Export/EwolMechFile_EMF", - "tracker_url": "", - "support": 'OFFICIAL', "category": "Import-Export"} if "bpy" in locals(): @@ -22,16 +18,19 @@ if "bpy" in locals(): import bpy -from bpy.props import (BoolProperty, - FloatProperty, - StringProperty, - EnumProperty, - ) -from bpy_extras.io_utils import (ExportHelper, - ImportHelper, - path_reference_mode, - axis_conversion, - ) +from bpy.props import ( + BoolProperty, + FloatProperty, + StringProperty, + EnumProperty, + ) +from bpy_extras.io_utils import ( + ImportHelper, + ExportHelper, + orientation_helper, + path_reference_mode, + axis_conversion, + ) class ImportEMF(bpy.types.Operator, ImportHelper): @@ -67,6 +66,7 @@ class ImportEMF(bpy.types.Operator, ImportHelper): layout.prop(self, "use_image_search") +#@orientation_helper(axis_forward='-Z', axis_up='Y') class ExportEMF(bpy.types.Operator, ExportHelper): """Save a Wavefront EMF File""" @@ -138,16 +138,27 @@ def menu_func_export(self, context): self.layout.operator(ExportEMF.bl_idname, text="Ewol mesh File (.emf)") +classes = ( + ImportEMF, + ExportEMF, +) + + def register(): - bpy.utils.register_module(__name__) - bpy.types.INFO_MT_file_import.append(menu_func_import) - bpy.types.INFO_MT_file_export.append(menu_func_export) + for cls in classes: + bpy.utils.register_class(cls) + + bpy.types.TOPBAR_MT_file_import.append(menu_func_import) + bpy.types.TOPBAR_MT_file_export.append(menu_func_export) def unregister(): - bpy.utils.unregister_module(__name__) - bpy.types.INFO_MT_file_import.remove(menu_func_import) - bpy.types.INFO_MT_file_export.remove(menu_func_export) + bpy.types.TOPBAR_MT_file_import.remove(menu_func_import) + bpy.types.TOPBAR_MT_file_export.remove(menu_func_export) + + for cls in classes: + bpy.utils.unregister_class(cls) + if __name__ == "__main__": - register() + register() diff --git a/blender/io_scene_emf/export_emf.py b/blender/io_scene_emf/export_emf.py index 1095b04..5ca64e7 100644 --- a/blender/io_scene_emf/export_emf.py +++ b/blender/io_scene_emf/export_emf.py @@ -92,7 +92,7 @@ def get_physics_shape(obj, mainObjScale): # CONVEX-HULL elif name.startswith('convex'): shape = "ConvexHull" - mesh = obj.to_mesh( bpy.context.scene, True, 'PREVIEW' ) + mesh = obj.to_mesh() props["points"] = "" for v in mesh.vertices: props["points"] += "" + out_point3( v.co ) + "|" @@ -294,24 +294,26 @@ def write_mesh(scene, file, object, mtl_dict): #for plop in object.child: # print(" child:'%s'" % plop.name) # ignore dupli children - if object.parent and object.parent.dupli_type in {'VERTS', 'FACES'}: + if object.parent and object.parent.instance_type in {'VERTS', 'FACES'}: # XXX print(object.name, 'is a dupli child - ignoring') return obs = [] - if object.dupli_type != 'NONE': + if object.instance_type != 'NONE': # XXX - print('creating dupli_list on', object.name) + print('******************** creating instance_type on', object.name) + """ object.dupli_list_create(scene) obs = [(dob.object, dob.matrix) for dob in object.dupli_list] # XXX debug print print(object.name, 'has', len(obs), 'dupli children') + """ else: obs = [(object, object.matrix_world)] for ob, ob_mat in obs: try: # apply the mesh modifieur at the curent object: - me = ob.to_mesh(scene, True, 'PREVIEW', calc_tessface=False) + me = ob.to_mesh() except RuntimeError: me = None if me is None: @@ -643,7 +645,7 @@ def _write(context, # get the curent frame selected: frame = scene.frame_current # Loop through all frames in the scene and export. - scene.frame_set(frame, 0.0) + scene.frame_set(frame, subframe=0.0) # get only the object that are selected or all... if EXPORT_SEL_ONLY: objects = context.selected_objects diff --git a/ege/resource/Mesh.cpp b/ege/resource/Mesh.cpp index 0cd4dd8..740c31a 100644 --- a/ege/resource/Mesh.cpp +++ b/ege/resource/Mesh.cpp @@ -197,9 +197,9 @@ void ege::resource::Mesh::draw(mat4& _positionMatrix, vec3 cameraNormal = vec3(0,0,-1); cameraNormal.normalized(); // remove face that is notin the view ... - etk::Vector tmpIndexResult; - etk::Vector& tmppFaces = m_listFaces.getValue(kkk).m_faces; - //etk::Vector& tmppIndex = m_listFaces.getValue(kkk).m_index; + List tmpIndexResult; + List& tmppFaces = m_listFaces.getValue(kkk).m_faces; + //List& tmppIndex = m_listFaces.getValue(kkk).m_index; switch(m_normalMode) { case ege::resource::Mesh::normalMode::face: for(size_t iii=0; iii _draw) { etk::Color tmpColor(0.0, 1.0, 0.0, 1.0); - etk::Vector vertices; + List vertices; // generate element in 2 pass : // - create new index dependeng a vertex is a unique componenet of position, texture, normal // - the index list generation (can be dynamic ... (TODO later) @@ -381,7 +381,7 @@ void ege::resource::Mesh::calculateNormaleEdge(const etk::String& _materialName) return; } for(size_t iii=0 ; iii& tmpFaceList = m_listFaces[_materialName].m_faces; + List& tmpFaceList = m_listFaces[_materialName].m_faces; vec3 normal(0,0,0); // add the vertex from all the element in the list for face when the element in the face ... for(size_t jjj=0 ; jjj& _list, const etk::Color& _color) { +void ege::resource::Mesh::addLines(const etk::String& _layerName, const List& _list, const etk::Color& _color) { for (size_t iii=1; iii<_list.size(); ++iii) { addLine(_layerName, _list[iii-1], _list[iii], _color); } } -void ege::resource::Mesh::addLines(const etk::String& _layerName, const etk::Vector& _list, const etk::Vector>& _color) { +void ege::resource::Mesh::addLines(const etk::String& _layerName, const List& _list, const List>& _color) { if (_color.size() != _list.size()) { EGE_ERROR("Can not add line with changing color without same number of color"); return; @@ -735,7 +735,7 @@ void ege::resource::Mesh::addTriangle(const etk::String& _layerName, const vec3& } #include -const etk::Vector>& ege::resource::Mesh::getPhysicalProperties() { +const List>& ege::resource::Mesh::getPhysicalProperties() { for (auto &it: m_physics) { if (it == null) { EGE_WARNING("Get null ... "); @@ -752,7 +752,7 @@ const etk::Vector>& ege::resource::Mesh: //EGE_INFO(" add vertices : " << m_listVertex); tmpElement->setListOfVertex(m_listVertex); for (size_t kkk=0; kkk index; + List index; for (auto &it : m_listFaces.getValue(kkk).m_faces) { index.pushBack(it.m_vertex[0]); index.pushBack(it.m_vertex[1]); diff --git a/ege/resource/Mesh.hpp b/ege/resource/Mesh.hpp index 1ab8fc7..2e30724 100644 --- a/ege/resource/Mesh.hpp +++ b/ege/resource/Mesh.hpp @@ -105,14 +105,14 @@ namespace ege { MaterialGlId m_GLMaterial; ege::Light m_light; protected: - etk::Vector m_listVertex; //!< List of all vertex in the element - etk::Vector m_listUV; //!< List of all UV point in the mesh (for the specify texture) - etk::Vector> m_listColor; //!< List of all Color point in the mesh - etk::Vector m_listFacesNormal; //!< List of all Face normal, when calculated - etk::Vector m_listVertexNormal; //!< List of all Face normal, when calculated + List m_listVertex; //!< List of all vertex in the element + List m_listUV; //!< List of all UV point in the mesh (for the specify texture) + List> m_listColor; //!< List of all Color point in the mesh + List m_listFacesNormal; //!< List of all Face normal, when calculated + List m_listVertexNormal; //!< List of all Face normal, when calculated etk::Map m_listFaces; //!< List of all Face for the mesh etk::Map> m_materials; - etk::Vector> m_physics; //!< collision shape module ... (independent of bullet lib) + List> m_physics; //!< collision shape module ... (independent of bullet lib) void clean(); protected: ememory::SharedPtr m_verticesVBO; @@ -162,7 +162,7 @@ namespace ege { bool getCheckNormal() { return m_checkNormal; }; - const etk::Vector>& getPhysicalProperties(); + const List>& getPhysicalProperties(); void addPhysicElement(const ememory::SharedPtr& _shape) { if (_shape == null) { return; @@ -203,8 +203,8 @@ namespace ege { addLine( _layerName, _pos1, _pos2, _color, _color); } void addLine(const etk::String& _layerName, const vec3& _pos1, const vec3& _pos2, const etk::Color& _color1, const etk::Color& _color2); - void addLines(const etk::String& _layerName, const etk::Vector& _list, const etk::Color& _color); - void addLines(const etk::String& _layerName, const etk::Vector& _list, const etk::Vector>& _color); + void addLines(const etk::String& _layerName, const List& _list, const etk::Color& _color); + void addLines(const etk::String& _layerName, const List& _list, const List>& _color); /** * @not_in_doc diff --git a/lutin_ege.py b/lutin_ege.py deleted file mode 100644 index 76342ff..0000000 --- a/lutin_ege.py +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "LIBRARY" - -def get_desc(): - return "Ewol Game engine" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return "authors.txt" - -def get_version(): - return "version.txt" - -def configure(target, my_module): - my_module.add_extra_flags() - my_module.add_src_file([ - 'ege/debug.cpp', - 'ege/Engine.cpp', - 'ege/Component.cpp', - 'ege/Environement.cpp', - 'ege/camera/Camera.cpp', - 'ege/camera/View.cpp', - 'ege/camera/FPS.cpp', - 'ege/camera/ControlBase.cpp', - 'ege/position/Component.cpp', - 'ege/physics/Component.cpp', - 'ege/physics/Engine.cpp', - 'ege/Entity.cpp', - #'ege/elements/ElementBase.cpp', - #'ege/elements/ElementPhysic.cpp', - 'ege/particule/Component.cpp', - 'ege/particule/Engine.cpp', - 'ege/particule/Simple.cpp', - 'ege/ia/Component.cpp', - 'ege/ia/ComponentLua.cpp', - 'ege/ia/Engine.cpp', - 'ege/render/Component.cpp', - 'ege/render/Engine.cpp', - 'ege/widget/Mesh.cpp', - 'ege/widget/Scene.cpp', - 'ege/resource/Mesh.cpp', - 'ege/resource/MeshEmf.cpp', - 'ege/resource/MeshGird.cpp', - 'ege/resource/MeshCube.cpp', - 'ege/resource/MeshSphere.cpp', - 'ege/resource/MeshCylinder.cpp', - 'ege/resource/MeshCapsule.cpp', - 'ege/resource/MeshCone.cpp', - 'ege/resource/MeshObj.cpp', - 'ege/resource/ParticuleMesh.cpp', - 'ege/resource/tools/icoSphere.cpp', - 'ege/resource/tools/isoSphere.cpp', - 'ege/resource/tools/viewBox.cpp', - 'ege/Light.cpp', - 'ege/Material.cpp', - 'ege/physics/shape/Shape.cpp', - 'ege/physics/shape/Box.cpp', - 'ege/physics/shape/Capsule.cpp', - 'ege/physics/shape/Cone.cpp', - 'ege/physics/shape/ConvexHull.cpp', - 'ege/physics/shape/Cylinder.cpp', - 'ege/physics/shape/Sphere.cpp', - 'ege/physics/shape/Concave.cpp', - 'ege/Ray.cpp', - ]) - my_module.copy_path('data/ParticuleMesh.*') - my_module.copy_path('data/material*') - my_module.add_depend([ - 'ewol', - 'ephysics', - 'eproperty', - 'echrono', - 'luaWrapper', - ]) - my_module.add_flag('c++', [ - '-Wno-write-strings', - '-Wmissing-field-initializers', - '-Wall']) - my_module.add_header_file([ - 'ege/debug.hpp', - 'ege/Engine.hpp', - 'ege/Component.hpp', - 'ege/Environement.hpp', - 'ege/camera/Camera.hpp', - 'ege/camera/View.hpp', - 'ege/camera/FPS.hpp', - 'ege/camera/ControlBase.hpp', - 'ege/position/Component.hpp', - 'ege/physics/Engine.hpp', - 'ege/physics/Component.hpp', - 'ege/Entity.hpp', - #'ege/elements/ElementBase.hpp', - #'ege/elements/ElementPhysic.hpp', - 'ege/particule/Component.hpp', - 'ege/particule/Engine.hpp', - 'ege/particule/Simple.hpp', - 'ege/ia/Component.hpp', - 'ege/ia/ComponentLua.hpp', - 'ege/ia/Engine.hpp', - 'ege/render/Component.hpp', - 'ege/render/Engine.hpp', - 'ege/widget/Mesh.hpp', - 'ege/widget/Scene.hpp', - 'ege/resource/Mesh.hpp', - 'ege/resource/ParticuleMesh.hpp', - 'ege/resource/tools/icoSphere.hpp', - 'ege/resource/tools/isoSphere.hpp', - 'ege/resource/tools/viewBox.hpp', - 'ege/resource/tools/Face.hpp', - 'ege/resource/tools/FaceIndexing.hpp', - 'ege/Light.hpp', - 'ege/Material.hpp', - 'ege/physics/shape/Shape.hpp', - 'ege/physics/shape/Box.hpp', - 'ege/physics/shape/Capsule.hpp', - 'ege/physics/shape/Cone.hpp', - 'ege/physics/shape/ConvexHull.hpp', - 'ege/physics/shape/Cylinder.hpp', - 'ege/physics/shape/Sphere.hpp', - 'ege/physics/shape/Concave.hpp', - 'ege/Ray.hpp', - ]) - # TODO: Remove this ... - my_module.add_flag('c++', "-Wno-unused-variable") - my_module.add_flag('c++', "-Wno-overloaded-virtual") - return True - - diff --git a/sample/CameraPosition/GLD_ege-sample-camera-position.json b/sample/CameraPosition/GLD_ege-sample-camera-position.json new file mode 100644 index 0000000..25f67ed --- /dev/null +++ b/sample/CameraPosition/GLD_ege-sample-camera-position.json @@ -0,0 +1,40 @@ +{ + "type":"BINARY", + "sub-type":"SAMPLE", + "group-id":"com.atria-soft", + "description":"Ege sample : CameraPisition", + "license":"MPL-2", + "license-file":"file://../../LICENCE.txt", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "appl/debug.cpp", + "appl/main.cpp", + "appl/Windows.cpp" + ], + "dependency": [ + "ege" + ], + "copy": [ + { + "path":"data/*" + } + ], + "path":[ + "." + ], + "flag": { + "language": "c++", + "value": [ + "-DPROJECT_NAME=\"{{{project.name}}}\"", + "-DAPPL_VERSION=\"{{{project.version}}}\"" + ] + }, + "package":{ + "SECTION": ["Game"], + "PRIORITY": "optional" + } +} \ No newline at end of file diff --git a/sample/CameraPosition/lutin_ege-sample-camera-position.py b/sample/CameraPosition/lutin_ege-sample-camera-position.py deleted file mode 100644 index f06419f..0000000 --- a/sample/CameraPosition/lutin_ege-sample-camera-position.py +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "SAMPLE" - -def get_name(): - return "ege-sample-CameraPosition" - -def get_desc(): - return "ege sample : CameraPisition" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def get_version(): - return [0,1] - -def configure(target, my_module): - my_module.add_extra_flags() - - my_module.add_src_file([ - 'appl/debug.cpp', - 'appl/main.cpp', - 'appl/Windows.cpp' - ]) - - my_module.add_depend('ege') - - my_module.add_path(".") - - my_module.copy_path("data/*") - - my_module.add_flag('c++', [ - "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" - ]) - - # set the package properties: - my_module.set_pkg("SECTION", ["Game"]) - my_module.set_pkg("PRIORITY", "optional") - return True - diff --git a/sample/Collision/GLD_ege-sample-collision.json b/sample/Collision/GLD_ege-sample-collision.json new file mode 100644 index 0000000..0378688 --- /dev/null +++ b/sample/Collision/GLD_ege-sample-collision.json @@ -0,0 +1,40 @@ +{ + "type":"BINARY", + "sub-type":"SAMPLE", + "group-id":"com.atria-soft", + "description":"Ege sample : Collision", + "license":"MPL-2", + "license-file":"file://../../LICENCE.txt", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "appl/debug.cpp", + "appl/main.cpp", + "appl/Windows.cpp" + ], + "dependency": [ + "ege" + ], + "copy": [ + { + "path":"data/*" + } + ], + "path":[ + "." + ], + "flag": { + "language": "c++", + "value": [ + "-DPROJECT_NAME=\"{{{project.name}}}\"", + "-DAPPL_VERSION=\"{{{project.version}}}\"" + ] + }, + "package":{ + "SECTION": ["Game"], + "PRIORITY": "optional" + } +} \ No newline at end of file diff --git a/sample/Collision/lutin_ege-sample-collision.py b/sample/Collision/lutin_ege-sample-collision.py deleted file mode 100644 index f64760e..0000000 --- a/sample/Collision/lutin_ege-sample-collision.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "SAMPLE" - -def get_name(): - return "ege-sample-collision" - -def get_desc(): - return "ege sample : Collision" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def get_version(): - return [0,1] - -def configure(target, my_module): - my_module.add_extra_flags() - - my_module.add_src_file([ - 'appl/debug.cpp', - 'appl/main.cpp', - 'appl/Windows.cpp' - ]) - - my_module.add_depend('ege') - - my_module.add_path(".") - - my_module.copy_path("data/*") - - my_module.add_flag('c++', [ - "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" - ]) - - # set the package properties : - my_module.set_pkg("SECTION", ["Game"]) - my_module.set_pkg("PRIORITY", "optional") - - return True - diff --git a/sample/DoubleView/GLD_ege-sample-double-view.json b/sample/DoubleView/GLD_ege-sample-double-view.json new file mode 100644 index 0000000..b144b2d --- /dev/null +++ b/sample/DoubleView/GLD_ege-sample-double-view.json @@ -0,0 +1,40 @@ +{ + "type":"BINARY", + "sub-type":"SAMPLE", + "group-id":"com.atria-soft", + "description":"Ege sample : DoubleView", + "license":"MPL-2", + "license-file":"file://../../LICENCE.txt", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "appl/debug.cpp", + "appl/main.cpp", + "appl/Windows.cpp" + ], + "dependency": [ + "ege" + ], + "copy": [ + { + "path":"data/*" + } + ], + "path":[ + "." + ], + "flag": { + "language": "c++", + "value": [ + "-DPROJECT_NAME=\"{{{project.name}}}\"", + "-DAPPL_VERSION=\"{{{project.version}}}\"" + ] + }, + "package":{ + "SECTION": ["Game"], + "PRIORITY": "optional" + } +} \ No newline at end of file diff --git a/sample/DoubleView/lutin_ege-sample-double-view.py b/sample/DoubleView/lutin_ege-sample-double-view.py deleted file mode 100644 index e3659fb..0000000 --- a/sample/DoubleView/lutin_ege-sample-double-view.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "SAMPLE" - -def get_name(): - return "ege-sample-DoubleView" - -def get_desc(): - return "ege sample : DoubleView" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def get_version(): - return [0,1] - -def configure(target, my_module): - my_module.add_extra_flags() - - my_module.add_src_file([ - 'appl/debug.cpp', - 'appl/main.cpp', - 'appl/Windows.cpp' - ]) - - my_module.add_depend('ege') - - my_module.add_path(".") - - my_module.copy_path("data/*") - - my_module.add_flag('c++', [ - "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" - ]) - - # set the package properties: - my_module.set_pkg("SECTION", ["Game"]) - my_module.set_pkg("PRIORITY", "optional") - - return True - diff --git a/sample/IA/GLD_ege-sample-ia.json b/sample/IA/GLD_ege-sample-ia.json new file mode 100644 index 0000000..36f9b10 --- /dev/null +++ b/sample/IA/GLD_ege-sample-ia.json @@ -0,0 +1,42 @@ +{ + "type":"BINARY", + "sub-type":"SAMPLE", + "group-id":"com.atria-soft", + "description":"Ege sample : Artificial intelligence", + "license":"MPL-2", + "license-file":"file://../../LICENCE.txt", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "appl/debug.cpp", + "appl/main.cpp", + "appl/Windows.cpp" + ], + "dependency": [ + "ege" + ], + "copy": [ + { + "path":"data/*.emf" + },{ + "path":"data/*.lua" + } + ], + "path":[ + "." + ], + "flag": { + "language": "c++", + "value": [ + "-DPROJECT_NAME=\"{{{project.name}}}\"", + "-DAPPL_VERSION=\"{{{project.version}}}\"" + ] + }, + "package":{ + "SECTION": ["Game"], + "PRIORITY": "optional" + } +} \ No newline at end of file diff --git a/sample/IA/lutin_ege-sample-ia.py b/sample/IA/lutin_ege-sample-ia.py deleted file mode 100644 index 570c183..0000000 --- a/sample/IA/lutin_ege-sample-ia.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "SAMPLE" - -def get_name(): - return "ege-sample-ia" - -def get_desc(): - return "ege sample : Artificial intelligence" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def get_version(): - return [0,1] - -def configure(target, my_module): - my_module.add_extra_flags() - my_module.add_src_file([ - 'appl/debug.cpp', - 'appl/main.cpp', - 'appl/Windows.cpp', - ]) - my_module.add_depend('ege') - my_module.add_path(".") - my_module.copy_path("data/*.emf") - my_module.copy_path("data/*.lua") - my_module.add_flag('c++', [ - "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"", - ]) - # set the package properties: - my_module.set_pkg("SECTION", ["Game"]) - my_module.set_pkg("PRIORITY", "optional") - return True - diff --git a/sample/LowPoly/GLD_ege-sample-low-poly.json b/sample/LowPoly/GLD_ege-sample-low-poly.json new file mode 100644 index 0000000..e19ccf5 --- /dev/null +++ b/sample/LowPoly/GLD_ege-sample-low-poly.json @@ -0,0 +1,40 @@ +{ + "type":"BINARY", + "sub-type":"SAMPLE", + "group-id":"com.atria-soft", + "description":"Ege sample : Low poly test", + "license":"MPL-2", + "license-file":"file://../../LICENCE.txt", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "appl/debug.cpp", + "appl/main.cpp", + "appl/Windows.cpp" + ], + "dependency": [ + "ege" + ], + "copy": [ + { + "path":"data/*.emf" + } + ], + "path":[ + "." + ], + "flag": { + "language": "c++", + "value": [ + "-DPROJECT_NAME=\"{{{project.name}}}\"", + "-DAPPL_VERSION=\"{{{project.version}}}\"" + ] + }, + "package":{ + "SECTION": ["Game"], + "PRIORITY": "optional" + } +} \ No newline at end of file diff --git a/sample/LowPoly/lutin_ege-sample-low-poly.py b/sample/LowPoly/lutin_ege-sample-low-poly.py deleted file mode 100644 index 8a58102..0000000 --- a/sample/LowPoly/lutin_ege-sample-low-poly.py +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "SAMPLE" - -def get_name(): - return "ege-sample-LowPoly" - -def get_desc(): - return "ege sample : Low poly test" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def get_version(): - return [0,1] - -def configure(target, my_module): - my_module.add_extra_flags() - my_module.add_src_file([ - 'appl/debug.cpp', - 'appl/main.cpp', - 'appl/Windows.cpp', - ]) - my_module.add_depend('ege') - my_module.add_path(".") - my_module.copy_path("data/*.emf") - my_module.add_flag('c++', [ - "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"", - ]) - # set the package properties: - my_module.set_pkg("SECTION", ["Game"]) - my_module.set_pkg("PRIORITY", "optional") - return True - diff --git a/sample/MeshCreator/GLD_ege-sample-mesh-creator.json b/sample/MeshCreator/GLD_ege-sample-mesh-creator.json new file mode 100644 index 0000000..62f841e --- /dev/null +++ b/sample/MeshCreator/GLD_ege-sample-mesh-creator.json @@ -0,0 +1,40 @@ +{ + "type":"BINARY", + "sub-type":"SAMPLE", + "group-id":"com.atria-soft", + "description":"Ege sample : MeshCreator", + "license":"MPL-2", + "license-file":"file://../../LICENCE.txt", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "appl/debug.cpp", + "appl/main.cpp", + "appl/Windows.cpp" + ], + "dependency": [ + "ege" + ], + "copy": [ + { + "path":"data/*" + } + ], + "path":[ + "." + ], + "flag": { + "language": "c++", + "value": [ + "-DPROJECT_NAME=\"{{{project.name}}}\"", + "-DAPPL_VERSION=\"{{{project.version}}}\"" + ] + }, + "package":{ + "SECTION": ["Game"], + "PRIORITY": "optional" + } +} diff --git a/sample/MeshCreator/lutin_ege-sample-mesh-creator.py b/sample/MeshCreator/lutin_ege-sample-mesh-creator.py deleted file mode 100644 index 09c06fd..0000000 --- a/sample/MeshCreator/lutin_ege-sample-mesh-creator.py +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "TOOLS" - -def get_name(): - return "ege-sample-MeshCreator" - -def get_desc(): - return "ege sample : MeshCreator" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def get_version(): - return [0,1] - -def configure(target, my_module): - - my_module.add_src_file([ - 'appl/debug.cpp', - 'appl/main.cpp', - 'appl/Windows.cpp' - ]) - - my_module.add_depend('ege') - - my_module.add_path(".") - - my_module.copy_path("data/*") - - my_module.add_flag('c++', [ - "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" - ]) - - # set the package properties: - my_module.set_pkg("SECTION", ["Game"]) - my_module.set_pkg("PRIORITY", "optional") - - return True - diff --git a/sample/RayTest/GLD_ege-sample-raytracing.json b/sample/RayTest/GLD_ege-sample-raytracing.json new file mode 100644 index 0000000..9c4d307 --- /dev/null +++ b/sample/RayTest/GLD_ege-sample-raytracing.json @@ -0,0 +1,40 @@ +{ + "type":"BINARY", + "sub-type":"SAMPLE", + "group-id":"com.atria-soft", + "description":"Ege sample : RayTest", + "license":"MPL-2", + "license-file":"file://../../LICENCE.txt", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "appl/debug.cpp", + "appl/main.cpp", + "appl/Windows.cpp" + ], + "dependency": [ + "ege" + ], + "copy": [ + { + "path":"data/*" + } + ], + "path":[ + "." + ], + "flag": { + "language": "c++", + "value": [ + "-DPROJECT_NAME=\"{{{project.name}}}\"", + "-DAPPL_VERSION=\"{{{project.version}}}\"" + ] + }, + "package":{ + "SECTION": ["Game"], + "PRIORITY": "optional" + } +} \ No newline at end of file diff --git a/sample/RayTest/lutin_ege-sample-raytracing.py b/sample/RayTest/lutin_ege-sample-raytracing.py deleted file mode 100644 index 77168b3..0000000 --- a/sample/RayTest/lutin_ege-sample-raytracing.py +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "TEST" - -def get_name(): - return "ege-test-ray" - -def get_desc(): - return "ege sample : RayTest" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def get_version(): - return [0,2] - -def configure(target, my_module): - my_module.add_extra_flags() - - my_module.add_src_file([ - 'appl/debug.cpp', - 'appl/main.cpp', - 'appl/Windows.cpp' - ]) - - my_module.add_depend('ege') - - my_module.add_path(".") - - my_module.copy_path("data/*") - - my_module.add_flag('c++', [ - "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" - ]) - - # set the package properties: - my_module.set_pkg("SECTION", ["Development"]) - my_module.set_pkg("PRIORITY", "optional") - return True - diff --git a/sample/TorqueApply/GLD_ege-sample-torque-apply.json b/sample/TorqueApply/GLD_ege-sample-torque-apply.json new file mode 100644 index 0000000..72cc251 --- /dev/null +++ b/sample/TorqueApply/GLD_ege-sample-torque-apply.json @@ -0,0 +1,40 @@ +{ + "type":"BINARY", + "sub-type":"SAMPLE", + "group-id":"com.atria-soft", + "description":"Ege sample : Torque Apply", + "license":"MPL-2", + "license-file":"file://../../LICENCE.txt", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "appl/debug.cpp", + "appl/main.cpp", + "appl/Windows.cpp" + ], + "dependency": [ + "ege" + ], + "copy": [ + { + "path":"data/*" + } + ], + "path":[ + "." + ], + "flag": { + "language": "c++", + "value": [ + "-DPROJECT_NAME=\"{{{project.name}}}\"", + "-DAPPL_VERSION=\"{{{project.version}}}\"" + ] + }, + "package":{ + "SECTION": ["Game"], + "PRIORITY": "optional" + } +} \ No newline at end of file diff --git a/sample/TorqueApply/lutin_ege-sample-torque-apply.py b/sample/TorqueApply/lutin_ege-sample-torque-apply.py deleted file mode 100644 index 6ca2879..0000000 --- a/sample/TorqueApply/lutin_ege-sample-torque-apply.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "SAMPLE" - -def get_name(): - return "ege-sample-torque-apply" - -def get_desc(): - return "ege sample : Torque Apply" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def get_version(): - return [0,1] - -def configure(target, my_module): - my_module.add_extra_flags() - - my_module.add_src_file([ - 'appl/debug.cpp', - 'appl/main.cpp', - 'appl/Windows.cpp' - ]) - - my_module.add_depend('ege') - - my_module.add_path(".") - - my_module.copy_path("data/*") - - my_module.add_flag('c++', [ - "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" - ]) - - # set the package properties : - my_module.set_pkg("SECTION", ["Game"]) - my_module.set_pkg("PRIORITY", "optional") - - return True -