mirror of
https://github.com/Heretek-AI/GDevelop.git
synced 2026-08-24 22:31:30 -04:00
Changed all SetValue to ChangeValue, so as to prevent bugs with GTK on linux.
git-svn-id: svn://localhost@107 8062f311-0dae-4547-b526-b8ab9ac864a5
This commit is contained in:
+104
-2
@@ -5,9 +5,10 @@
|
||||
<Option title="GDL" />
|
||||
<Option pch_mode="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Option virtualFolders="LIB fparser\;md5\;AES\;" />
|
||||
<Option virtualFolders="Math parser\LIB fparser\;Math parser\;AES\;md5\;" />
|
||||
<Build>
|
||||
<Target title="Debug">
|
||||
<Option platforms="Windows;" />
|
||||
<Option output="..\Runtime\bin\debug\gdl" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="obj\Debug\" />
|
||||
<Option type="3" />
|
||||
@@ -47,6 +48,7 @@
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Debug - Edittime">
|
||||
<Option platforms="Windows;" />
|
||||
<Option output="..\IDE\bin\debug\gdl" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="obj\Debug Edittime\" />
|
||||
<Option type="3" />
|
||||
@@ -118,6 +120,7 @@
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release">
|
||||
<Option platforms="Windows;" />
|
||||
<Option output="..\Runtime\bin\release\gdl" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="obj\Release\" />
|
||||
<Option type="3" />
|
||||
@@ -155,6 +158,7 @@
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release - Edittime">
|
||||
<Option platforms="Windows;" />
|
||||
<Option output="..\IDE\bin\release\gdl" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="obj\Release Edittime\" />
|
||||
<Option type="3" />
|
||||
@@ -224,6 +228,7 @@
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Development">
|
||||
<Option platforms="Windows;" />
|
||||
<Option output="..\Runtime\bin\dev\gdl" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="obj\Dev\" />
|
||||
<Option type="3" />
|
||||
@@ -261,6 +266,7 @@
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Development - Edittime">
|
||||
<Option platforms="Windows;" />
|
||||
<Option output="..\IDE\bin\dev\gdl" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="obj\Dev Edittime\" />
|
||||
<Option type="3" />
|
||||
@@ -331,6 +337,7 @@
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Linux - Release">
|
||||
<Option platforms="Windows;Unix;" />
|
||||
<Option output="..\Runtime\bin\release\libgdl.so" prefix_auto="0" extension_auto="0" />
|
||||
<Option object_output="obj\Release\" />
|
||||
<Option type="3" />
|
||||
@@ -370,6 +377,95 @@
|
||||
<Add directory="\home\florian\Programmation\libs\sfml\lib" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Linux - Release - Edittime">
|
||||
<Option platforms="Windows;Unix;" />
|
||||
<Option output="..\IDE\bin\release\libgdl.so" prefix_auto="0" extension_auto="0" />
|
||||
<Option object_output="obj\Release\" />
|
||||
<Option type="3" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Option createStaticLib="1" />
|
||||
<Compiler>
|
||||
<Add option="-O2" />
|
||||
<Add option="-Wall" />
|
||||
<Add option="-fno-stack-protector" />
|
||||
<Add option="-finput-charset=iso-8859-1" />
|
||||
<Add option="-m32" />
|
||||
<Add option="`wx-config --cppflags`" />
|
||||
<Add option="`pkg-config gtk+-2.0 --cflags`" />
|
||||
<Add option="-DGDE" />
|
||||
<Add option='-DGD_API=""' />
|
||||
<Add option="-DRELEASE" />
|
||||
<Add option="-DLINUX" />
|
||||
<Add option="-DSFML_DYNAMIC" />
|
||||
<Add directory="\home\florian\Programmation\libs\boost_1_38_0" />
|
||||
<Add directory="\home\florian\Programmation\libs\sfml\include" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="-s" />
|
||||
<Add option="`wx-config --libs all`" />
|
||||
<Add option="-lsfml-audio" />
|
||||
<Add option="-lsfml-graphics" />
|
||||
<Add option="-lsfml-window" />
|
||||
<Add option="-lsfml-network" />
|
||||
<Add option="-lsfml-system" />
|
||||
<Add option="-lsndfile" />
|
||||
<Add option="-lopenal" />
|
||||
<Add option="-lfreetype" />
|
||||
<Add option="-lX11" />
|
||||
<Add option="-lXrandr" />
|
||||
<Add option="-lXrender" />
|
||||
<Add option="-lFLAC" />
|
||||
<Add option="-lGLU" />
|
||||
<Add option="-lGL" />
|
||||
<Add option="-lpthread" />
|
||||
<Add directory="\home\florian\Programmation\libs\sfml\lib" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Linux - Debug - Edittime">
|
||||
<Option platforms="Windows;Unix;" />
|
||||
<Option output="..\IDE\bin\debug\libgdl.so" prefix_auto="0" extension_auto="0" />
|
||||
<Option object_output="obj\Debug\" />
|
||||
<Option type="3" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Option createStaticLib="1" />
|
||||
<Compiler>
|
||||
<Add option="-Wall" />
|
||||
<Add option="-g" />
|
||||
<Add option="-fno-stack-protector" />
|
||||
<Add option="-finput-charset=iso-8859-1" />
|
||||
<Add option="-m32" />
|
||||
<Add option="`wx-config --cppflags`" />
|
||||
<Add option="`pkg-config gtk+-2.0 --cflags`" />
|
||||
<Add option="-DGDE" />
|
||||
<Add option='-DGD_API=""' />
|
||||
<Add option="-DDEBUG" />
|
||||
<Add option="-DLINUX" />
|
||||
<Add option="-DSFML_DYNAMIC" />
|
||||
<Add directory="\home\florian\Programmation\libs\boost_1_38_0" />
|
||||
<Add directory="\home\florian\Programmation\libs\sfml\include" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="`wx-config --libs all`" />
|
||||
<Add option="-lsfml-audio" />
|
||||
<Add option="-lsfml-graphics" />
|
||||
<Add option="-lsfml-window" />
|
||||
<Add option="-lsfml-network" />
|
||||
<Add option="-lsfml-system" />
|
||||
<Add option="-lsndfile" />
|
||||
<Add option="-lopenal" />
|
||||
<Add option="-lfreetype" />
|
||||
<Add option="-lX11" />
|
||||
<Add option="-lXrandr" />
|
||||
<Add option="-lXrender" />
|
||||
<Add option="-lFLAC" />
|
||||
<Add option="-lGLU" />
|
||||
<Add option="-lGL" />
|
||||
<Add option="-lpthread" />
|
||||
<Add directory="\home\florian\Programmation\libs\sfml\lib" />
|
||||
</Linker>
|
||||
</Target>
|
||||
</Build>
|
||||
<Compiler>
|
||||
<Add directory="..\GDL\" />
|
||||
@@ -478,6 +574,12 @@
|
||||
<Unit filename="GDL\Force.h" />
|
||||
<Unit filename="GDL\GDExpression.cpp" />
|
||||
<Unit filename="GDL\GDExpression.h" />
|
||||
<Unit filename="GDL\GDMathParser.cpp">
|
||||
<Option virtualFolder="Math parser\" />
|
||||
</Unit>
|
||||
<Unit filename="GDL\GDMathParser.h">
|
||||
<Option virtualFolder="Math parser\" />
|
||||
</Unit>
|
||||
<Unit filename="GDL\Game.cpp" />
|
||||
<Unit filename="GDL\Game.h" />
|
||||
<Unit filename="GDL\HelpFileAccess.cpp" />
|
||||
@@ -689,7 +791,7 @@
|
||||
<Unit filename="GDL\eObjectFunctions.cpp" />
|
||||
<Unit filename="GDL\eObjectFunctions.h" />
|
||||
<Unit filename="GDL\fparser\fparser.cc">
|
||||
<Option virtualFolder="LIB fparser\" />
|
||||
<Option virtualFolder="Math parser\LIB fparser\" />
|
||||
</Unit>
|
||||
<Unit filename="GDL\gdTreeItemStringData.cpp" />
|
||||
<Unit filename="GDL\gdTreeItemStringData.h" />
|
||||
|
||||
+69
-60
@@ -7,13 +7,13 @@
|
||||
<File name="GDL\AES.h" open="0" top="0" tabpos="7">
|
||||
<Cursor position="3931" topLine="75" />
|
||||
</File>
|
||||
<File name="GDL\Access.cpp" open="0" top="0" tabpos="3">
|
||||
<Cursor position="3351" topLine="87" />
|
||||
<File name="GDL\Access.cpp" open="1" top="0" tabpos="5">
|
||||
<Cursor position="20276" topLine="506" />
|
||||
</File>
|
||||
<File name="GDL\Access.h" open="0" top="0" tabpos="13">
|
||||
<Cursor position="222" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\AdvancedExtension.cpp" open="1" top="0" tabpos="10">
|
||||
<File name="GDL\AdvancedExtension.cpp" open="0" top="0" tabpos="9">
|
||||
<Cursor position="655" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\AjoutPlusImage.cpp" open="0" top="0" tabpos="4">
|
||||
@@ -67,12 +67,15 @@
|
||||
<File name="GDL\ChoixDossier.h" open="0" top="0" tabpos="10">
|
||||
<Cursor position="320" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\ChooseObject.cpp" open="0" top="0" tabpos="7">
|
||||
<Cursor position="15468" topLine="318" />
|
||||
<File name="GDL\ChooseObject.cpp" open="0" top="0" tabpos="21">
|
||||
<Cursor position="11188" topLine="184" />
|
||||
</File>
|
||||
<File name="GDL\ChooseObject.h" open="0" top="0" tabpos="8">
|
||||
<Cursor position="1445" topLine="58" />
|
||||
</File>
|
||||
<File name="GDL\ChooseObjectExpression.cpp" open="0" top="0" tabpos="41">
|
||||
<Cursor position="3590" topLine="55" />
|
||||
</File>
|
||||
<File name="GDL\ChooseObjectExpression.h" open="0" top="0" tabpos="12">
|
||||
<Cursor position="342" topLine="0" />
|
||||
</File>
|
||||
@@ -85,14 +88,14 @@
|
||||
<File name="GDL\CommentEvent.h" open="0" top="0" tabpos="25">
|
||||
<Cursor position="933" topLine="14" />
|
||||
</File>
|
||||
<File name="GDL\CommonInstructions.cpp" open="1" top="0" tabpos="14">
|
||||
<File name="GDL\CommonInstructions.cpp" open="0" top="0" tabpos="13">
|
||||
<Cursor position="1168" topLine="19" />
|
||||
</File>
|
||||
<File name="GDL\CommonInstructions.h" open="0" top="0" tabpos="4">
|
||||
<Cursor position="366" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\CommonInstructionsExtension.cpp" open="1" top="0" tabpos="5">
|
||||
<Cursor position="690" topLine="12" />
|
||||
<File name="GDL\CommonInstructionsExtension.cpp" open="1" top="1" tabpos="7">
|
||||
<Cursor position="1841" topLine="24" />
|
||||
</File>
|
||||
<File name="GDL\CommonInstructionsExtension.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="147" topLine="0" />
|
||||
@@ -115,44 +118,44 @@
|
||||
<File name="GDL\Dossier.h" open="0" top="0" tabpos="85">
|
||||
<Cursor position="3" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\EditComment.cpp" open="0" top="0" tabpos="9">
|
||||
<Cursor position="4696" topLine="83" />
|
||||
<File name="GDL\EditComment.cpp" open="0" top="0" tabpos="42">
|
||||
<Cursor position="3749" topLine="51" />
|
||||
</File>
|
||||
<File name="GDL\EditComment.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="449" topLine="4" />
|
||||
</File>
|
||||
<File name="GDL\EditExpression.cpp" open="1" top="0" tabpos="15">
|
||||
<Cursor position="32167" topLine="572" />
|
||||
<File name="GDL\EditExpression.cpp" open="0" top="0" tabpos="14">
|
||||
<Cursor position="19677" topLine="284" />
|
||||
</File>
|
||||
<File name="GDL\EditExpression.h" open="0" top="0" tabpos="11">
|
||||
<Cursor position="0" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\EditForEachEvent.cpp" open="0" top="0" tabpos="2">
|
||||
<Cursor position="5929" topLine="36" />
|
||||
<File name="GDL\EditForEachEvent.cpp" open="0" top="0" tabpos="43">
|
||||
<Cursor position="6156" topLine="89" />
|
||||
</File>
|
||||
<File name="GDL\EditForEachEvent.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="462" topLine="10" />
|
||||
</File>
|
||||
<File name="GDL\EditLink.cpp" open="0" top="0" tabpos="10">
|
||||
<Cursor position="9616" topLine="160" />
|
||||
<File name="GDL\EditLink.cpp" open="0" top="0" tabpos="44">
|
||||
<Cursor position="10062" topLine="163" />
|
||||
</File>
|
||||
<File name="GDL\EditLink.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="369" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\EditRepeatEvent.cpp" open="0" top="0" tabpos="5">
|
||||
<Cursor position="1106" topLine="29" />
|
||||
<File name="GDL\EditRepeatEvent.cpp" open="0" top="0" tabpos="45">
|
||||
<Cursor position="5903" topLine="88" />
|
||||
</File>
|
||||
<File name="GDL\EditRepeatEvent.h" open="0" top="0" tabpos="6">
|
||||
<Cursor position="1624" topLine="29" />
|
||||
</File>
|
||||
<File name="GDL\EditorImages.cpp" open="0" top="0" tabpos="11">
|
||||
<Cursor position="16145" topLine="267" />
|
||||
<Cursor position="5996" topLine="125" />
|
||||
</File>
|
||||
<File name="GDL\EditorImages.h" open="0" top="0" tabpos="28">
|
||||
<Cursor position="137" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\EditorObjet.cpp" open="0" top="0" tabpos="4">
|
||||
<Cursor position="34136" topLine="446" />
|
||||
<File name="GDL\EditorObjet.cpp" open="0" top="0" tabpos="46">
|
||||
<Cursor position="38765" topLine="592" />
|
||||
</File>
|
||||
<File name="GDL\EditorObjet.h" open="0" top="0" tabpos="2">
|
||||
<Cursor position="7946" topLine="233" />
|
||||
@@ -166,22 +169,22 @@
|
||||
<File name="GDL\ErrorReport.h" open="0" top="0" tabpos="11">
|
||||
<Cursor position="0" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\Event.cpp" open="0" top="0" tabpos="6">
|
||||
<Cursor position="294" topLine="0" />
|
||||
<File name="GDL\Event.cpp" open="0" top="0" tabpos="18">
|
||||
<Cursor position="662" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\Event.h" open="0" top="0" tabpos="20">
|
||||
<Cursor position="863" topLine="33" />
|
||||
<File name="GDL\Event.h" open="0" top="0" tabpos="17">
|
||||
<Cursor position="5739" topLine="139" />
|
||||
</File>
|
||||
<File name="GDL\EventsPreprocessor.cpp" open="1" top="0" tabpos="16">
|
||||
<Cursor position="8001" topLine="142" />
|
||||
<File name="GDL\EventsPreprocessor.cpp" open="0" top="0" tabpos="15">
|
||||
<Cursor position="6354" topLine="120" />
|
||||
</File>
|
||||
<File name="GDL\EventsPreprocessor.h" open="0" top="0" tabpos="13">
|
||||
<Cursor position="307" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\EventsRenderingHelper.cpp" open="1" top="0" tabpos="1">
|
||||
<File name="GDL\EventsRenderingHelper.cpp" open="0" top="0" tabpos="1">
|
||||
<Cursor position="4676" topLine="94" />
|
||||
</File>
|
||||
<File name="GDL\EventsRenderingHelper.h" open="1" top="0" tabpos="3">
|
||||
<File name="GDL\EventsRenderingHelper.h" open="0" top="0" tabpos="3">
|
||||
<Cursor position="1654" topLine="10" />
|
||||
</File>
|
||||
<File name="GDL\ExpressionInstruction.cpp" open="0" top="0" tabpos="0">
|
||||
@@ -190,20 +193,20 @@
|
||||
<File name="GDL\ExpressionInstruction.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="1006" topLine="5" />
|
||||
</File>
|
||||
<File name="GDL\ExtensionBase.cpp" open="1" top="0" tabpos="7">
|
||||
<File name="GDL\ExtensionBase.cpp" open="0" top="0" tabpos="6">
|
||||
<Cursor position="860" topLine="13" />
|
||||
</File>
|
||||
<File name="GDL\ExtensionBase.h" open="1" top="0" tabpos="6">
|
||||
<File name="GDL\ExtensionBase.h" open="0" top="0" tabpos="5">
|
||||
<Cursor position="13640" topLine="269" />
|
||||
</File>
|
||||
<File name="GDL\ExtensionsLoader.cpp" open="0" top="0" tabpos="7">
|
||||
<Cursor position="7728" topLine="185" />
|
||||
<File name="GDL\ExtensionsLoader.cpp" open="0" top="0" tabpos="40">
|
||||
<Cursor position="4244" topLine="101" />
|
||||
</File>
|
||||
<File name="GDL\ExtensionsLoader.h" open="0" top="0" tabpos="11">
|
||||
<Cursor position="336" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\ExtensionsManager.cpp" open="0" top="0" tabpos="9">
|
||||
<Cursor position="2681" topLine="58" />
|
||||
<File name="GDL\ExtensionsManager.cpp" open="0" top="0" tabpos="39">
|
||||
<Cursor position="2723" topLine="37" />
|
||||
</File>
|
||||
<File name="GDL\ExtensionsManager.h" open="0" top="0" tabpos="5">
|
||||
<Cursor position="5547" topLine="126" />
|
||||
@@ -214,11 +217,11 @@
|
||||
<File name="GDL\FontManager.h" open="0" top="0" tabpos="12">
|
||||
<Cursor position="491" topLine="4" />
|
||||
</File>
|
||||
<File name="GDL\ForEachEvent.cpp" open="1" top="0" tabpos="4">
|
||||
<File name="GDL\ForEachEvent.cpp" open="0" top="0" tabpos="4">
|
||||
<Cursor position="6236" topLine="198" />
|
||||
</File>
|
||||
<File name="GDL\ForEachEvent.h" open="0" top="0" tabpos="24">
|
||||
<Cursor position="2456" topLine="35" />
|
||||
<File name="GDL\ForEachEvent.h" open="0" top="0" tabpos="16">
|
||||
<Cursor position="1225" topLine="23" />
|
||||
</File>
|
||||
<File name="GDL\Force.cpp" open="0" top="0" tabpos="14">
|
||||
<Cursor position="142" topLine="2" />
|
||||
@@ -226,11 +229,17 @@
|
||||
<File name="GDL\Force.h" open="0" top="0" tabpos="15">
|
||||
<Cursor position="829" topLine="33" />
|
||||
</File>
|
||||
<File name="GDL\GDExpression.cpp" open="0" top="0" tabpos="12">
|
||||
<Cursor position="1004" topLine="10" />
|
||||
<File name="GDL\GDExpression.cpp" open="1" top="0" tabpos="2">
|
||||
<Cursor position="959" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\GDExpression.h" open="0" top="0" tabpos="15">
|
||||
<Cursor position="3838" topLine="84" />
|
||||
<File name="GDL\GDExpression.h" open="1" top="0" tabpos="3">
|
||||
<Cursor position="1822" topLine="41" />
|
||||
</File>
|
||||
<File name="GDL\GDMathParser.cpp" open="1" top="0" tabpos="4">
|
||||
<Cursor position="595" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\GDMathParser.h" open="1" top="0" tabpos="1">
|
||||
<Cursor position="349" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\Game.cpp" open="0" top="0" tabpos="11">
|
||||
<Cursor position="1538" topLine="43" />
|
||||
@@ -292,8 +301,8 @@
|
||||
<File name="GDL\Log.cpp" open="0" top="0" tabpos="12">
|
||||
<Cursor position="840" topLine="15" />
|
||||
</File>
|
||||
<File name="GDL\Log.h" open="0" top="0" tabpos="21">
|
||||
<Cursor position="83" topLine="0" />
|
||||
<File name="GDL\Log.h" open="0" top="0" tabpos="20">
|
||||
<Cursor position="291" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\MainEditorCommand.cpp" open="0" top="0" tabpos="39">
|
||||
<Cursor position="52" topLine="0" />
|
||||
@@ -322,7 +331,7 @@
|
||||
<File name="GDL\Music.cpp" open="0" top="0" tabpos="34">
|
||||
<Cursor position="595" topLine="19" />
|
||||
</File>
|
||||
<File name="GDL\NetworkExtension.cpp" open="1" top="0" tabpos="13">
|
||||
<File name="GDL\NetworkExtension.cpp" open="0" top="0" tabpos="12">
|
||||
<Cursor position="1850" topLine="11" />
|
||||
</File>
|
||||
<File name="GDL\ObjInstancesHolder.cpp" open="0" top="0" tabpos="3">
|
||||
@@ -370,17 +379,17 @@
|
||||
<File name="GDL\Position.h" open="0" top="0" tabpos="30">
|
||||
<Cursor position="356" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\PropImage.cpp" open="0" top="0" tabpos="84">
|
||||
<Cursor position="3" topLine="0" />
|
||||
<File name="GDL\PropImage.cpp" open="0" top="0" tabpos="47">
|
||||
<Cursor position="8684" topLine="115" />
|
||||
</File>
|
||||
<File name="GDL\PropImage.h" open="0" top="0" tabpos="17">
|
||||
<Cursor position="292" topLine="1" />
|
||||
</File>
|
||||
<File name="GDL\RepeatEvent.cpp" open="1" top="0" tabpos="9">
|
||||
<File name="GDL\RepeatEvent.cpp" open="0" top="0" tabpos="8">
|
||||
<Cursor position="6092" topLine="161" />
|
||||
</File>
|
||||
<File name="GDL\RepeatEvent.h" open="0" top="0" tabpos="23">
|
||||
<Cursor position="750" topLine="17" />
|
||||
<Cursor position="1107" topLine="17" />
|
||||
</File>
|
||||
<File name="GDL\RessourcesLoader.cpp" open="0" top="0" tabpos="11">
|
||||
<Cursor position="4155" topLine="114" />
|
||||
@@ -448,17 +457,17 @@
|
||||
<File name="GDL\SpriteInitialPositionPanel.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="636" topLine="8" />
|
||||
</File>
|
||||
<File name="GDL\SpriteObject.cpp" open="0" top="0" tabpos="35">
|
||||
<Cursor position="13847" topLine="382" />
|
||||
<File name="GDL\SpriteObject.cpp" open="0" top="0" tabpos="48">
|
||||
<Cursor position="13821" topLine="372" />
|
||||
</File>
|
||||
<File name="GDL\SpriteObject.h" open="0" top="0" tabpos="37">
|
||||
<Cursor position="738" topLine="21" />
|
||||
</File>
|
||||
<File name="GDL\StandardEvent.cpp" open="1" top="0" tabpos="2">
|
||||
<Cursor position="7162" topLine="168" />
|
||||
<File name="GDL\StandardEvent.cpp" open="0" top="0" tabpos="2">
|
||||
<Cursor position="6172" topLine="168" />
|
||||
</File>
|
||||
<File name="GDL\StandardEvent.h" open="0" top="0" tabpos="21">
|
||||
<Cursor position="504" topLine="9" />
|
||||
<Cursor position="1162" topLine="19" />
|
||||
</File>
|
||||
<File name="GDL\StdAlgo.cpp" open="0" top="0" tabpos="42">
|
||||
<Cursor position="83" topLine="0" />
|
||||
@@ -505,11 +514,11 @@
|
||||
<File name="GDL\VersionWrapper.h" open="0" top="0" tabpos="2">
|
||||
<Cursor position="162" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\WhileEvent.cpp" open="1" top="0" tabpos="8">
|
||||
<File name="GDL\WhileEvent.cpp" open="0" top="0" tabpos="7">
|
||||
<Cursor position="6093" topLine="192" />
|
||||
</File>
|
||||
<File name="GDL\WhileEvent.h" open="0" top="0" tabpos="22">
|
||||
<Cursor position="677" topLine="13" />
|
||||
<Cursor position="1034" topLine="13" />
|
||||
</File>
|
||||
<File name="GDL\WindowExtension.cpp" open="0" top="0" tabpos="59">
|
||||
<Cursor position="320" topLine="0" />
|
||||
@@ -544,10 +553,10 @@
|
||||
<File name="GDL\aMove.cpp" open="0" top="0" tabpos="47">
|
||||
<Cursor position="10671" topLine="256" />
|
||||
</File>
|
||||
<File name="GDL\aNet.cpp" open="1" top="0" tabpos="11">
|
||||
<File name="GDL\aNet.cpp" open="0" top="0" tabpos="10">
|
||||
<Cursor position="3721" topLine="65" />
|
||||
</File>
|
||||
<File name="GDL\aNet.h" open="1" top="0" tabpos="12">
|
||||
<File name="GDL\aNet.h" open="0" top="0" tabpos="11">
|
||||
<Cursor position="223" topLine="0" />
|
||||
</File>
|
||||
<File name="GDL\aObjet.cpp" open="0" top="0" tabpos="48">
|
||||
@@ -673,8 +682,8 @@
|
||||
<File name="GDL\eObjectFunctions.cpp" open="0" top="0" tabpos="23">
|
||||
<Cursor position="4646" topLine="105" />
|
||||
</File>
|
||||
<File name="GDL\fparser\fparser.cc" open="0" top="0" tabpos="11">
|
||||
<Cursor position="271" topLine="0" />
|
||||
<File name="GDL\fparser\fparser.cc" open="1" top="0" tabpos="6">
|
||||
<Cursor position="2920" topLine="123" />
|
||||
</File>
|
||||
<File name="GDL\gpl.h" open="0" top="0" tabpos="0">
|
||||
<Cursor position="165" topLine="0" />
|
||||
|
||||
@@ -104,19 +104,23 @@ onlyObjectOfType(onlyObjectOfType_)
|
||||
SetSizer(FlexGridSizer1);
|
||||
editMenuItem = new wxMenuItem((&Menu1), ID_MENUITEM2, _("Choisir cet objet"), wxEmptyString, wxITEM_NORMAL);
|
||||
Menu1.Append(editMenuItem);
|
||||
#ifdef __WXMSW__
|
||||
Menu1.Remove(editMenuItem);
|
||||
wxFont boldFont(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT);
|
||||
editMenuItem->SetFont(boldFont);
|
||||
Menu1.Append(editMenuItem);
|
||||
#endif
|
||||
Menu1.AppendSeparator();
|
||||
MenuItem1 = new wxMenuItem((&Menu1), ID_MENUITEM1, _("Pour ajouter des objets, utilisez l\'éditeur d\'objets"), wxEmptyString, wxITEM_NORMAL);
|
||||
Menu1.Append(MenuItem1);
|
||||
editGroupMenuItem = new wxMenuItem((&Menu2), ID_MENUITEM3, _("Choisir ce groupe"), wxEmptyString, wxITEM_NORMAL);
|
||||
Menu2.Append(editGroupMenuItem);
|
||||
#ifdef __WXMSW__
|
||||
Menu2.Remove(editGroupMenuItem);
|
||||
wxFont boldFont2(wxDEFAULT,wxDEFAULT,wxFONTSTYLE_NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT);
|
||||
editGroupMenuItem->SetFont(boldFont2);
|
||||
Menu2.Append(editGroupMenuItem);
|
||||
#endif
|
||||
Menu2.AppendSeparator();
|
||||
MenuItem4 = new wxMenuItem((&Menu2), ID_MENUITEM4, _("Pour ajouter des groupes, utilisez l\'éditeur de groupes d\'objets"), wxEmptyString, wxITEM_NORMAL);
|
||||
Menu2.Append(MenuItem4);
|
||||
|
||||
@@ -31,7 +31,7 @@ commentEvent(event_)
|
||||
wxFlexGridSizer* FlexGridSizer2;
|
||||
wxStaticBoxSizer* StaticBoxSizer1;
|
||||
wxFlexGridSizer* FlexGridSizer1;
|
||||
|
||||
|
||||
Create(parent, wxID_ANY, _("Editer le commentaire"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMINIMIZE_BOX, _T("wxID_ANY"));
|
||||
FlexGridSizer1 = new wxFlexGridSizer(0, 1, 0, 0);
|
||||
FlexGridSizer1->AddGrowableCol(0);
|
||||
@@ -59,15 +59,15 @@ commentEvent(event_)
|
||||
FlexGridSizer1->Fit(this);
|
||||
FlexGridSizer1->SetSizeHints(this);
|
||||
Center();
|
||||
|
||||
|
||||
Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&EditComment::OnColorBtClick);
|
||||
Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&EditComment::OnOkBtClick);
|
||||
Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&EditComment::OnAnnulerBtClick);
|
||||
Connect(ID_BUTTON4,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&EditComment::OnAideBtClick);
|
||||
//*)
|
||||
|
||||
Com1Edit->SetValue( commentEvent.com1 );
|
||||
Com2Edit->SetValue( commentEvent.com2 );
|
||||
Com1Edit->ChangeValue( commentEvent.com1 );
|
||||
Com2Edit->ChangeValue( commentEvent.com2 );
|
||||
|
||||
ColorBt->SetBackgroundColour(wxColour(commentEvent.r, commentEvent.v, commentEvent.b ));
|
||||
}
|
||||
|
||||
+23
-88
@@ -264,7 +264,7 @@ mainObjectsName(mainObjectsName_)
|
||||
imageListVal->Add(( wxBitmap( "res/actions/net.png", wxBITMAP_TYPE_ANY ) ) );
|
||||
ValList->AssignImageList( imageListVal );
|
||||
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshLists();
|
||||
}
|
||||
|
||||
@@ -376,73 +376,8 @@ void EditExpression::RefreshLists()
|
||||
}
|
||||
}
|
||||
|
||||
/*dossier = ObjList->AppendItem( ObjList->GetRootItem(), _( "Positions" ), 1 );
|
||||
ObjList->AppendItem( dossier, _( "Position x d'un objet" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Position y d'un objet" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Position x d'un point d'un objet" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Position y d'un point d'un objet" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Distance entre deux objets" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Distance au carré entre deux objets" ), 0 );
|
||||
|
||||
dossier = ObjList->AppendItem( ObjList->GetRootItem(), _( "Déplacement" ), 2 );
|
||||
ObjList->AppendItem( dossier, _( "Force moyenne en X" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Force moyenne en Y" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Angle moyen des forces" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Longueur moyenne des forces" ), 0 );
|
||||
|
||||
dossier = ObjList->AppendItem( ObjList->GetRootItem(), _( "Direction" ), 3 );
|
||||
ObjList->AppendItem( dossier, _( "Numéro de direction d'un objet" ), 0 );
|
||||
|
||||
dossier = ObjList->AppendItem( ObjList->GetRootItem(), _( "Animations et images" ), 4 );
|
||||
ObjList->AppendItem( dossier, _( "Numéro d'animation d'un objet" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Numéro de l'image d'un objet" ), 0 );
|
||||
|
||||
dossier = ObjList->AppendItem( ObjList->GetRootItem(), _( "Taille" ), 17 );
|
||||
ObjList->AppendItem( dossier, _( "Echelle de la largeur d'un objet" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Echelle de la hauteur d'un objet" ), 0 );
|
||||
|
||||
dossier = ObjList->AppendItem( ObjList->GetRootItem(), _( "Variables" ), 5 );
|
||||
ObjList->AppendItem( dossier, _( "Valeur d'une variable" ), 0 );
|
||||
|
||||
dossier = ObjList->AppendItem( ObjList->GetRootItem(), _( "Visibilité" ), 7 );
|
||||
ObjList->AppendItem( dossier, _( "Plan d'un objet" ), 0 );
|
||||
|
||||
dossier = ObjList->AppendItem( ObjList->GetRootItem(), _( "Autre" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Nombre d'objets concernés" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Largeur d'un objet" ), 0 );
|
||||
ObjList->AppendItem( dossier, _( "Hauteur d'un objet" ), 0 );*/
|
||||
ObjList->Expand(ObjList->GetRootItem());
|
||||
|
||||
/*ValList->AppendItem( ValList->GetRootItem(), _( "Nombre aléatoire" ), 0 );
|
||||
|
||||
dossier = ValList->AppendItem( ValList->GetRootItem(), _( "Variables" ), 5 );
|
||||
ValList->AppendItem( dossier, _( "Valeur d'une variable globale" ),0 );
|
||||
ValList->AppendItem( dossier, _( "Valeur d'une variable de la scène" ),0 );
|
||||
|
||||
dossier = ValList->AppendItem( ValList->GetRootItem(), _( "Caméra" ), 10 );
|
||||
ValList->AppendItem( dossier, _( "Position X de la caméra" ),0 );
|
||||
ValList->AppendItem( dossier, _( "Position Y de la caméra" ),0 );
|
||||
ValList->AppendItem( dossier, _( "Rotation de la caméra" ),0 );
|
||||
|
||||
dossier = ValList->AppendItem( ValList->GetRootItem(), _( "Souris" ), 11 );
|
||||
ValList->AppendItem( dossier, _( "Position X de la souris" ),0 );
|
||||
ValList->AppendItem( dossier, _( "Position Y de la souris" ),0 );
|
||||
|
||||
ValList->AppendItem( ValList->GetRootItem(), _( "Temps écoulé depuis la dernière image" ), 0 );
|
||||
ValList->AppendItem( ValList->GetRootItem(), _( "Temps écoulé depuis le début de la scène" ), 0 );
|
||||
ValList->AppendItem( ValList->GetRootItem(), _( "Echelle du temps" ), 0 );
|
||||
|
||||
dossier = ValList->AppendItem( ValList->GetRootItem(), _( "Temps" ),0 );
|
||||
ValList->AppendItem( dossier, _( "Heure" ),0 );
|
||||
ValList->AppendItem( dossier, _( "Minutes" ),0 );
|
||||
ValList->AppendItem( dossier, _( "Secondes" ),0 );
|
||||
ValList->AppendItem( dossier, _( "Numéro du jour dans la semaine" ),0 );
|
||||
ValList->AppendItem( dossier, _( "Numéro du jour dans le mois" ),0 );
|
||||
ValList->AppendItem( dossier, _( "Numéro du jour dans l'année" ),0 );
|
||||
ValList->AppendItem( dossier, _( "Années depuis 1900" ),0 );*/
|
||||
|
||||
ValList->Expand(ValList->GetRootItem());
|
||||
|
||||
}
|
||||
|
||||
void EditExpression::RefreshExpressionEdit()
|
||||
@@ -493,56 +428,56 @@ void EditExpression::RefreshExpressionEdit()
|
||||
void EditExpression::OnPlusBtClick(wxCommandEvent& event)
|
||||
{
|
||||
expression += "+";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnMinusBtClick(wxCommandEvent& event)
|
||||
{
|
||||
expression += "-";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnMultBtClick(wxCommandEvent& event)
|
||||
{
|
||||
expression += "*";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnDivBtClick(wxCommandEvent& event)
|
||||
{
|
||||
expression += "/";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnPOBtClick(wxCommandEvent& event)
|
||||
{
|
||||
expression += "(";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnPFBtClick(wxCommandEvent& event)
|
||||
{
|
||||
expression += ")";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnCosBtClick(wxCommandEvent& event)
|
||||
{
|
||||
expression += "cos";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnSinBtClick(wxCommandEvent& event)
|
||||
{
|
||||
expression += "sin";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
@@ -593,7 +528,7 @@ void EditExpression::OnAddPropBtClick(wxCommandEvent& event)
|
||||
|
||||
expression += "OBJ("+object+"["+associatedData->GetString()+"]"+parametersStr+")";
|
||||
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
return;
|
||||
}
|
||||
@@ -618,7 +553,7 @@ void EditExpression::OnAddValBtClick(wxCommandEvent& event)
|
||||
|
||||
expression += "VAL("+associatedData->GetString()+parametersStr+")";
|
||||
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
return;
|
||||
}
|
||||
@@ -652,84 +587,84 @@ void EditExpression::OnValListItemDoubleClicked(wxTreeEvent& event)
|
||||
void EditExpression::OnButton2Click(wxCommandEvent& event)
|
||||
{
|
||||
expression += "^";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnButton3Click(wxCommandEvent& event)
|
||||
{
|
||||
expression += "E";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnBitmapButton2Click(wxCommandEvent& event)
|
||||
{
|
||||
expression += "sqrt(";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnBitmapButton1Click(wxCommandEvent& event)
|
||||
{
|
||||
expression += "nthroot(x,n)";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnButton4Click(wxCommandEvent& event)
|
||||
{
|
||||
expression += "exp(";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnButton1Click(wxCommandEvent& event)
|
||||
{
|
||||
expression += "log(";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnButton5Click(wxCommandEvent& event)
|
||||
{
|
||||
expression += "tan";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnButton6Click(wxCommandEvent& event)
|
||||
{
|
||||
expression += "abs";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnButton7Click(wxCommandEvent& event)
|
||||
{
|
||||
expression += "acos";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnButton8Click(wxCommandEvent& event)
|
||||
{
|
||||
expression += "asin";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnButton9Click(wxCommandEvent& event)
|
||||
{
|
||||
expression += "atan";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
|
||||
void EditExpression::OnintBtClick(wxCommandEvent& event)
|
||||
{
|
||||
expression += "int(";
|
||||
ExpressionEdit->SetValue(expression);
|
||||
ExpressionEdit->ChangeValue(expression);
|
||||
RefreshExpressionEdit();
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -91,7 +91,7 @@ scene(scene_)
|
||||
Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&EditForEachEvent::OncancelBtClick);
|
||||
//*)
|
||||
|
||||
objectEdit->SetValue(eventEdited.GetObjectToPick());
|
||||
objectEdit->ChangeValue(eventEdited.GetObjectToPick());
|
||||
}
|
||||
|
||||
EditForEachEvent::~EditForEachEvent()
|
||||
@@ -116,7 +116,7 @@ void EditForEachEvent::OnobjectBtClick(wxCommandEvent& event)
|
||||
{
|
||||
ChooseObject dialog(this, game, scene, true, string(objectEdit->GetValue().mb_str()));
|
||||
if ( dialog.ShowModal() == 1 )
|
||||
objectEdit->SetValue(dialog.objectChosen);
|
||||
objectEdit->ChangeValue(dialog.objectChosen);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ eventToEdit(pEvent)
|
||||
wxStaticBoxSizer* StaticBoxSizer1;
|
||||
wxFlexGridSizer* FlexGridSizer1;
|
||||
wxFlexGridSizer* FlexGridSizer17;
|
||||
|
||||
|
||||
Create(parent, wxID_ANY, _("Créer un lien vers une autre scène"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, _T("wxID_ANY"));
|
||||
FlexGridSizer1 = new wxFlexGridSizer(0, 1, 0, 0);
|
||||
FlexGridSizer17 = new wxFlexGridSizer(0, 1, 0, 0);
|
||||
@@ -116,7 +116,7 @@ eventToEdit(pEvent)
|
||||
SetSizer(FlexGridSizer1);
|
||||
FlexGridSizer1->Fit(this);
|
||||
FlexGridSizer1->SetSizeHints(this);
|
||||
|
||||
|
||||
Connect(ID_TEXTCTRL2,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&EditLink::OnStartEditText);
|
||||
Connect(ID_TEXTCTRL3,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&EditLink::OnEndEditText);
|
||||
Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&EditLink::OnOkBtClick);
|
||||
@@ -124,12 +124,12 @@ eventToEdit(pEvent)
|
||||
Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&EditLink::OnAideBtClick);
|
||||
//*)
|
||||
|
||||
NomSceneEdit->SetValue(eventToEdit.sceneLinked);
|
||||
NomSceneEdit->ChangeValue(eventToEdit.sceneLinked);
|
||||
if ( eventToEdit.start != -1 && eventToEdit.end != -1 )
|
||||
{
|
||||
OnlyEventsCheck->SetValue(true);
|
||||
StartEdit->SetValue(st(eventToEdit.start));
|
||||
EndEdit->SetValue(st(eventToEdit.end));
|
||||
StartEdit->ChangeValue(st(eventToEdit.start));
|
||||
EndEdit->ChangeValue(st(eventToEdit.end));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -196,4 +196,4 @@ void EditLink::OnEndEditText(wxCommandEvent& event)
|
||||
{
|
||||
OnlyEventsCheck->SetValue(true);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -90,7 +90,7 @@ scene(scene_)
|
||||
Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&EditRepeatEvent::OncancelBtClick);
|
||||
//*)
|
||||
|
||||
expressionEdit->SetValue(event.GetRepeatExpression());
|
||||
expressionEdit->ChangeValue(event.GetRepeatExpression());
|
||||
}
|
||||
|
||||
EditRepeatEvent::~EditRepeatEvent()
|
||||
@@ -105,7 +105,7 @@ void EditRepeatEvent::OnexpressionBtClick(wxCommandEvent& )
|
||||
vector < string > mainObjectsName;
|
||||
EditExpression dialog(this, string( expressionEdit->GetValue().mb_str() ), game, scene, true, mainObjectsName);
|
||||
if ( dialog.ShowModal() == 1 )
|
||||
expressionEdit->SetValue(dialog.expression);
|
||||
expressionEdit->ChangeValue(dialog.expression);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -607,7 +607,7 @@ void EditorObjet::RefreshImages()
|
||||
if ( direction < object.GetAnimation( animation ).GetDirectionsNumber() )
|
||||
{
|
||||
//Temps
|
||||
TempsEdit->SetValue( stFromFloat( object.GetAnimation( animation ).GetDirection( direction ).GetTimeBetweenFrames() ) );
|
||||
TempsEdit->ChangeValue( stFromFloat( object.GetAnimation( animation ).GetDirection( direction ).GetTimeBetweenFrames() ) );
|
||||
|
||||
//Boucle
|
||||
if ( object.GetAnimation( animation ).GetDirection( direction ).IsLooping() )
|
||||
|
||||
@@ -109,6 +109,12 @@ void ExtensionsLoader::LoadAllExtensionsAvailable()
|
||||
rep = opendir( directory.c_str() );
|
||||
int l = 0;
|
||||
|
||||
if ( rep == NULL )
|
||||
{
|
||||
cout << "Unable to open Extensions directory." << endl;
|
||||
return;
|
||||
}
|
||||
|
||||
while (( lecture = readdir( rep ) ) )
|
||||
{
|
||||
string lec = lecture->d_name;
|
||||
|
||||
@@ -1,23 +1,7 @@
|
||||
#include "GDL/GDExpression.h"
|
||||
#include "GDL/ExpressionInstruction.h"
|
||||
#include "GDL/gpl.h"
|
||||
#include <cmath>
|
||||
|
||||
/**
|
||||
* Common mathematic function : Distance betwenn two point
|
||||
*/
|
||||
double DistanceMathFunction(const double* p)
|
||||
{
|
||||
return gpl::sqrt((p[0]-p[2])*(p[0]-p[2])+(p[1]-p[3])*(p[1]-p[3]));
|
||||
}
|
||||
|
||||
/**
|
||||
* Common mathematic function : Angle betwenn two point ( Degrees, GD Repere )
|
||||
*/
|
||||
double AngleMathFunction(const double* p)
|
||||
{
|
||||
return -atan2(p[3]-p[1],(p[2]-p[0]))*180/3.14159265;
|
||||
}
|
||||
|
||||
GDExpression::GDExpression(std::string plainString_) : plainString(plainString_), oIDcomputed(false), isPreprocessed(false)
|
||||
{
|
||||
@@ -36,8 +20,6 @@ GDExpression::GDExpression(std::string plainString_) : plainString(plainString_)
|
||||
else if (plainString == "/" ) modOperator = Divide;
|
||||
else modOperator = UndefinedModification;
|
||||
|
||||
mathExpression.AddFunction("distance", DistanceMathFunction, 4);
|
||||
mathExpression.AddFunction("angle", AngleMathFunction, 4);
|
||||
}
|
||||
|
||||
GDExpression::~GDExpression()
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
#include "GDL/fparser/fparser.hh"
|
||||
#include "GDL/GDMathParser.h"
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include "GDL/ExpressionInstruction.h"
|
||||
#include "GDL/ObjectIdentifiersManager.h"
|
||||
@@ -110,7 +110,7 @@ class GD_API GDExpression
|
||||
mutable unsigned int oID; ///< Object identifier, if expression contains an object name.
|
||||
mutable bool oIDcomputed;
|
||||
|
||||
FunctionParser mathExpression; ///<Object representing the mathemathic expression to parse and evaluate.
|
||||
GDMathParser mathExpression; ///<Object representing the mathemathic expression to parse and evaluate.
|
||||
std::vector < ExpressionInstruction > mathExpressionFunctions; ///< The functions to call to generate the values of the parameters to pass to the mathematic expression when evaluating.
|
||||
bool isPreprocessed; ///<Indicate if the functions to call and the mathematic expression have been preprocessed.
|
||||
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
#include "GDL/GDMathParser.h"
|
||||
#include <iostream>
|
||||
|
||||
/**
|
||||
* Common mathematic function : Distance betwenn two point
|
||||
*/
|
||||
double DistanceMathFunction(const double* p)
|
||||
{
|
||||
return gpl::sqrt((p[0]-p[2])*(p[0]-p[2])+(p[1]-p[3])*(p[1]-p[3]));
|
||||
}
|
||||
|
||||
/**
|
||||
* Common mathematic function : Angle betwenn two point ( Degrees, GD Repere )
|
||||
*/
|
||||
double AngleMathFunction(const double* p)
|
||||
{
|
||||
return -atan2(p[3]-p[1],(p[2]-p[0]))*180/3.14159265;
|
||||
}
|
||||
|
||||
GDMathParser::GDMathParser() :
|
||||
FunctionParser()
|
||||
{
|
||||
AddConstant("pi", 3.14159265358979323846);
|
||||
AddConstant("e", 2.71828182845904523536);
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
#ifndef GDMATHPARSER_H
|
||||
#define GDMATHPARSER_H
|
||||
|
||||
#include "GDL/fparser/fparser.hh"
|
||||
#include <cmath>
|
||||
#include "gpl.h"
|
||||
|
||||
double DistanceMathFunction(const double* p);
|
||||
double AngleMathFunction(const double* p);
|
||||
|
||||
/**
|
||||
* Game Develop mathematical expression parser
|
||||
*/
|
||||
class GDMathParser: public FunctionParser
|
||||
{
|
||||
public:
|
||||
GDMathParser();
|
||||
virtual ~GDMathParser() {};
|
||||
};
|
||||
|
||||
|
||||
#endif // GDMATHPARSER_H
|
||||
@@ -131,8 +131,8 @@ image(pImage)
|
||||
//*)
|
||||
|
||||
LissageCheck->SetValue(image.smooth);
|
||||
NomEdit->SetValue(image.nom);
|
||||
FichierEdit->SetValue(image.fichier);
|
||||
NomEdit->ChangeValue(image.nom);
|
||||
FichierEdit->ChangeValue(image.fichier);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -387,7 +387,7 @@ wxPanel * SpriteObject::CreateInitialPositionPanel( wxWindow* parent, const Game
|
||||
{
|
||||
SpriteInitialPositionPanel * panel = new SpriteInitialPositionPanel(parent);
|
||||
|
||||
panel->DirectionEdit->SetValue(ToString( position.angle ));
|
||||
panel->DirectionEdit->ChangeValue(ToString( position.angle ));
|
||||
|
||||
for (unsigned int i = 0;i<GetAnimationsNumber();i++ )
|
||||
panel->AnimationCombo->Append(ToString(i));
|
||||
|
||||
+7
-7
@@ -4,7 +4,7 @@
|
||||
namespace AutoVersion{
|
||||
|
||||
//Date Version Types
|
||||
static const char DATE[] = "01";
|
||||
static const char DATE[] = "04";
|
||||
static const char MONTH[] = "05";
|
||||
static const char YEAR[] = "2010";
|
||||
static const char UBUNTU_VERSION_STYLE[] = "10.05";
|
||||
@@ -16,14 +16,14 @@ namespace AutoVersion{
|
||||
//Standard Version Type
|
||||
static const long MAJOR = 1;
|
||||
static const long MINOR = 3;
|
||||
static const long BUILD = 9254;
|
||||
static const long REVISION = 46592;
|
||||
static const long BUILD = 9262;
|
||||
static const long REVISION = 46622;
|
||||
|
||||
//Miscellaneous Version Types
|
||||
static const long BUILDS_COUNT = 19502;
|
||||
#define RC_FILEVERSION 1,3,9254,46592
|
||||
#define RC_FILEVERSION_STRING "1, 3, 9254, 46592\0"
|
||||
static const char FULLVERSION_STRING[] = "1.3.9254.46592";
|
||||
static const long BUILDS_COUNT = 19508;
|
||||
#define RC_FILEVERSION 1,3,9262,46622
|
||||
#define RC_FILEVERSION_STRING "1, 3, 9262, 46622\0"
|
||||
static const char FULLVERSION_STRING[] = "1.3.9262.46622";
|
||||
|
||||
//These values are to keep track of your versioning state, don't modify them.
|
||||
static const long BUILD_HISTORY = 0;
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
<object class="wxMenu" variable="Menu1" member="yes">
|
||||
<object class="wxMenuItem" name="ID_MENUITEM2" variable="editMenuItem" member="yes">
|
||||
<label>Choisir cet objet</label>
|
||||
<extra_code> Menu1.Remove(editMenuItem);
 wxFont boldFont(wxDEFAULT,wxDEFAULT,wxFONTSTYLE__NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING__DEFAULT);
 editMenuItem->SetFont(boldFont);
 Menu1.Append(editMenuItem);</extra_code>
|
||||
<extra_code>#ifdef ____WXMSW____
 Menu1.Remove(editMenuItem);
 wxFont boldFont(wxDEFAULT,wxDEFAULT,wxFONTSTYLE__NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING__DEFAULT);
 editMenuItem->SetFont(boldFont);
 Menu1.Append(editMenuItem);
#endif</extra_code>
|
||||
<handler function="OnChoisirBtClick" entry="EVT_MENU" />
|
||||
</object>
|
||||
<object class="separator" />
|
||||
@@ -159,7 +159,7 @@
|
||||
<object class="wxMenu" variable="Menu2" member="yes">
|
||||
<object class="wxMenuItem" name="ID_MENUITEM3" variable="editGroupMenuItem" member="yes">
|
||||
<label>Choisir ce groupe</label>
|
||||
<extra_code> Menu2.Remove(editGroupMenuItem);
 wxFont boldFont2(wxDEFAULT,wxDEFAULT,wxFONTSTYLE__NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING__DEFAULT);
 editGroupMenuItem->SetFont(boldFont2);
 Menu2.Append(editGroupMenuItem);</extra_code>
|
||||
<extra_code>#ifdef ____WXMSW____
 Menu2.Remove(editGroupMenuItem);
 wxFont boldFont2(wxDEFAULT,wxDEFAULT,wxFONTSTYLE__NORMAL,wxBOLD,false,wxEmptyString,wxFONTENCODING__DEFAULT);
 editGroupMenuItem->SetFont(boldFont2);
 Menu2.Append(editGroupMenuItem);
#endif</extra_code>
|
||||
<handler function="OnChoisirBtClick" entry="EVT_MENU" />
|
||||
</object>
|
||||
<object class="separator" />
|
||||
|
||||
Reference in New Issue
Block a user