diff --git a/README.md b/README.md index 307f20e..5e3314f 100644 --- a/README.md +++ b/README.md @@ -3,41 +3,18 @@ Ege `Ege` (Ewol Game Engine) is a FREE software. -Copyright (c) -============= +License (APACHE v2.0) +===================== +Copyright ege Edouard DUPIN -2011, Edouard DUPIN +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at -License (DSB v3) -============= - -Note : only for etk and EWOL - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. The name of the author may not be used to endorse or promote - products derived from this software without specific prior - written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/ege/Environement.cpp b/ege/Environement.cpp index 828c1b6..3e55170 100644 --- a/ege/Environement.cpp +++ b/ege/Environement.cpp @@ -275,3 +275,13 @@ ege::Environement::Environement() : m_particuleEngine(*this) { // nothing to do ... } + +void ege::Environement::clear() { + for (auto &it : m_listElementGame) { + if (it != nullptr) { + delete it; + it = nullptr; + } + } + m_listElementGame.clear(); +} diff --git a/ege/Environement.h b/ege/Environement.h index 314554b..125a79b 100644 --- a/ege/Environement.h +++ b/ege/Environement.h @@ -42,11 +42,15 @@ namespace ege { protected: int32_t m_type; public: - int32_t getType() { return m_type; }; + int32_t getType() { + return m_type; + }; protected: int32_t m_groupSource; public: - int32_t getSourceGroup() { return m_groupSource; }; + int32_t getSourceGroup() { + return m_groupSource; + }; protected: std::vector m_groupDestination; public: @@ -80,6 +84,10 @@ namespace ege { Environement(); virtual ~Environement() { }; public: + /** + * @brief Remove all from the current environement + */ + void clear(); /** * @brief add a creator element system * @param[in] _type Type of the element. diff --git a/license.txt b/license.txt index 6b0c1ca..32b9e58 100644 --- a/license.txt +++ b/license.txt @@ -1,34 +1,13 @@ -Copyright (c) 2013, Edouard DUPIN -All rights reserved. +Copyright ege Edouard DUPIN -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - * Neither the name of the EGE nor the names of its contributors - may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -see : http://opensource.org/licenses/BSD-3-Clause + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file