Changed structure of project group

dimsa · Dec 20, 2016 · 82cf7ec · 82cf7ec
1 parent 52898f2
commit 82cf7ec
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 61 deletions.
diff --git a/AsteroidsDemo/AsteroidsDemo.dproj b/AsteroidsDemo/AsteroidsDemo.dproj
@@ -368,12 +368,27 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployClass Name="ProjectiOSDeviceResourceRules">
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
                     <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                     </Platform>
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectOSXResource">
@@ -725,27 +740,12 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
+                <DeployClass Name="ProjectiOSDeviceResourceRules">
                     <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
                 </DeployClass>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>

diff --git a/SOEngine.groupproj b/SOEngine.groupproj
@@ -15,8 +15,8 @@
         <Projects Include="AsteroidsDemo\AsteroidsDemo.dproj">
             <Dependencies>SOEngine\SOEngine.dproj</Dependencies>
         </Projects>
-        <Projects Include="SOEngine\SoEngineTests\SOEngineTests.dproj">
-            <Dependencies>SOEngine\SOEngine.dproj</Dependencies>
+        <Projects Include="SoEngineTests\SOEngineTests.dproj">
+            <Dependencies/>
         </Projects>
     </ItemGroup>
     <ProjectExtensions>
@@ -62,14 +62,14 @@
     <Target Name="AsteroidsDemo:Make" DependsOnTargets="SOEngine:Make">
         <MSBuild Projects="AsteroidsDemo\AsteroidsDemo.dproj" Targets="Make"/>
     </Target>
-    <Target Name="SOEngineTests" DependsOnTargets="SOEngine">
-        <MSBuild Projects="SOEngine\SoEngineTests\SOEngineTests.dproj"/>
+    <Target Name="SOEngineTests">
+        <MSBuild Projects="SoEngineTests\SOEngineTests.dproj"/>
     </Target>
-    <Target Name="SOEngineTests:Clean" DependsOnTargets="SOEngine:Clean">
-        <MSBuild Projects="SOEngine\SoEngineTests\SOEngineTests.dproj" Targets="Clean"/>
+    <Target Name="SOEngineTests:Clean">
+        <MSBuild Projects="SoEngineTests\SOEngineTests.dproj" Targets="Clean"/>
     </Target>
-    <Target Name="SOEngineTests:Make" DependsOnTargets="SOEngine:Make">
-        <MSBuild Projects="SOEngine\SoEngineTests\SOEngineTests.dproj" Targets="Make"/>
+    <Target Name="SOEngineTests:Make">
+        <MSBuild Projects="SoEngineTests\SOEngineTests.dproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
         <CallTarget Targets="ShadowEngineDemo;SpriteShapeBuilder;SOEngine;AsteroidsDemo;SOEngineTests"/>

diff --git a/SOEngine/Parts/Animation/uEngine2DSpriteAnimation.pas b/SOEngine/Parts/Animation/uEngine2DSpriteAnimation.pas
@@ -49,7 +49,3 @@ procedure tSpriteAnimation.Setup;
 end;
 
 end.
-
-
-
-
diff --git a/SOEngine/Parts/Animation/uSoAnimator.pas b/SOEngine/Parts/Animation/uSoAnimator.pas
@@ -29,7 +29,7 @@ procedure TSoAnimator.Add(const AItem: TSoAnimation; const AName: string);
 var
   vName: string;
 begin
-  {$I .\Template\uItemAdd.inc}
+  {$I .\SoObject\uItemAdd.inc}
 end;
 
 function TSoAnimator.AddFromTemplate(const ASubject: TSoObject; const ATemplateName: string; const AName: string = ''): TSoAnimation;

diff --git a/SOEngine/Parts/Base/uSoBaseOperator.pas b/SOEngine/Parts/Base/uSoBaseOperator.pas
@@ -126,3 +126,4 @@ procedure TSoOperator<T>.OnItemDestroy(ASender: TObject);
 end;
 
 end.
+
diff --git a/SOEngine/Parts/Collider/NewShapeCollider/uIntersectorMethods.pas b/SOEngine/Parts/Collider/NewShapeCollider/uIntersectorMethods.pas
@@ -436,3 +436,4 @@ function SqrDistance(const APoint1,
 end;
 
 end.
+
diff --git a/SOEngine/Parts/Collider/uColliderDefinition.pas b/SOEngine/Parts/Collider/uColliderDefinition.pas
@@ -58,3 +58,4 @@ destructor TColliderDefinition.Destroy;
 end;
 
 end.
+
diff --git a/SOEngine/Parts/Collider/uSoCollider.pas b/SOEngine/Parts/Collider/uSoCollider.pas
@@ -45,7 +45,7 @@ procedure TSoCollider.Add(const AItem: TSoColliderObj; const AName: string);
   vName: string;
 begin
   AddAsProperty(AItem, AName);
-  {$I .\Template\uItemAdd.inc}
+  {$I .\SoObject\uItemAdd.inc}
 end;
 
 function TSoCollider.Add(const ASubject: TSoObject; const AColliderDef: TColliderDefinition; const AName: string): TSoColliderObj;

diff --git a/SOEngine/Parts/Formatters/uSoFormattor.pas b/SOEngine/Parts/Formatters/uSoFormattor.pas
@@ -36,7 +36,7 @@ procedure TSoFormattor.Add(const AItem: TSoFormatter; const AName: string);
 var
   vName: string;
 begin
-  {$I .\Template\uItemAdd.inc}
+  {$I .\SoObject\uItemAdd.inc}
 end;
 
 function TSoFormattor.AddFromTemplate(const ASubject: TSoObject; const ATemplateName: string; const AName: string = ''): TSoFormatter;

diff --git a/SOEngine/Parts/InputProcessor/uSoKeyProcessor.pas b/SOEngine/Parts/InputProcessor/uSoKeyProcessor.pas
@@ -27,7 +27,7 @@ procedure TSoKeyProcessor.Add(const AItem: TSoKeyHandler; const AName: string);
 var
   vName: string;
 begin
-  {$I .\Template\uItemAdd.inc}
+  {$I .\SoObject\uItemAdd.inc}
 end;
 
 constructor TSoKeyProcessor.Create(const ACritical: TCriticalSection);

diff --git a/SOEngine/Parts/InputProcessor/uSoMouseProcessor.pas b/SOEngine/Parts/InputProcessor/uSoMouseProcessor.pas
@@ -39,7 +39,7 @@ procedure TSoMouseProcessor.Add(const AItem: TSoMouseHandler;
 var
   vName: string;
 begin
-  {$I .\Template\uItemAdd.inc}
+  {$I .\SoObject\uItemAdd.inc}
   FContainers.Add(AItem.Subject, AItem);
 end;
 

diff --git a/SOEngine/Parts/Logic/uSoLogicKeeper.pas b/SOEngine/Parts/Logic/uSoLogicKeeper.pas
@@ -28,7 +28,7 @@ procedure TSoLogicKeeper.Add(const AItem: TSoLogic; const AName: string);
 var
   vName: string;
 begin
-  {$I .\Template\uItemAdd.inc}
+  {$I .\SoObject\uItemAdd.inc}
 end;
 
 function TSoLogicKeeper.AddFromTemplate(const ASubject: TSoObject; const ATemplateName,

diff --git a/SOEngine/Parts/Object_Deprecated/uEngine2DUnclickableObject.pas b/SOEngine/Parts/Object_Deprecated/uEngine2DUnclickableObject.pas
@@ -194,10 +194,3 @@ procedure tEngine2DUnclickableObject.setY(AValue: single);
 end;
 
 end.
-
-
-
-
-
-
-
diff --git a/SOEngine/Parts/Rendition/uSoRenderer.pas b/SOEngine/Parts/Rendition/uSoRenderer.pas
@@ -61,7 +61,7 @@ procedure TSoRenderer.Add(const AItem: TEngine2DRendition; const AName: string);
   TSoRenditionFriend(AItem).OnBringToBack := BringToBack;
   TSoRenditionFriend(AItem).OnSendToFront := SendToFront;
 
-  {$I .\Template\uItemAdd.inc}
+  {$I .\SoObject\uItemAdd.inc}
   TSoRenditionFriend(AItem).OnRequestAllRenditions := OnAllRenditionRequest;
 end;
 

diff --git a/SOEngine/Parts/Sound/uSoSoundKeeper.pas b/SOEngine/Parts/Sound/uSoSoundKeeper.pas
@@ -42,7 +42,7 @@ procedure TSoSoundKeeper.Add(const AItem: TSoSound; const AName: string);
 
   AddAsProperty(AItem, AName);
 
-  {$I .\Template\uItemAdd.inc}
+  {$I .\SoObject\uItemAdd.inc}
 end;
 
 function TSoSoundKeeper.AddByFileName(const ASubject: TSoObject; const AFileName, AName: string): TSoSound;

diff --git a/SOEngine/SOEngine.dpk b/SOEngine/SOEngine.dpk
@@ -72,14 +72,12 @@ contains
   uE2DSprite in 'Parts\Rendition\uE2DSprite.pas',
   uE2DText in 'Parts\Rendition\uE2DText.pas',
   uEngine2DModel in 'Main\uEngine2DModel.pas',
-  uSoObject in 'Template\uSoObject.pas',
   uE2DResourceList in 'Parts\Rendition\uE2DResourceList.pas',
   uCommonClasses in 'Common\uCommonClasses.pas',
   uSoBasePart in 'Parts\Base\uSoBasePart.pas',
   uE2DRendition in 'Parts\Rendition\uE2DRendition.pas',
   uSoEngine in 'Main\uSoEngine.pas',
   uSoModel in 'Main\uSoModel.pas',
-  uSoObjectKeeper in 'Template\uSoObjectKeeper.pas',
   uSoRenderer in 'Parts\Rendition\uSoRenderer.pas',
   uSoBaseOperator in 'Parts\Base\uSoBaseOperator.pas',
   uSoFormattor in 'Parts\Formatters\uSoFormattor.pas',
@@ -148,7 +146,9 @@ contains
   uSoContainer in 'Main\Container\uSoContainer.pas',
   uSoContainerKeeper in 'Main\Container\uSoContainerKeeper.pas',
   uSoContainerTypes in 'Main\Container\uSoContainerTypes.pas',
-  uSoPositionAdapter in 'Parts\PositionAdapter\uSoPositionAdapter.pas';
+  uSoPositionAdapter in 'Parts\PositionAdapter\uSoPositionAdapter.pas',
+  uSoObject in 'SoObject\uSoObject.pas',
+  uSoObjectKeeper in 'SoObject\uSoObjectKeeper.pas';
 
 end.
 
diff --git a/SOEngine/SOEngine.dproj b/SOEngine/SOEngine.dproj
@@ -185,14 +185,12 @@
         <DCCReference Include="Parts\Rendition\uE2DSprite.pas"/>
         <DCCReference Include="Parts\Rendition\uE2DText.pas"/>
         <DCCReference Include="Main\uEngine2DModel.pas"/>
-        <DCCReference Include="Template\uSoObject.pas"/>
         <DCCReference Include="Parts\Rendition\uE2DResourceList.pas"/>
         <DCCReference Include="Common\uCommonClasses.pas"/>
         <DCCReference Include="Parts\Base\uSoBasePart.pas"/>
         <DCCReference Include="Parts\Rendition\uE2DRendition.pas"/>
         <DCCReference Include="Main\uSoEngine.pas"/>
         <DCCReference Include="Main\uSoModel.pas"/>
-        <DCCReference Include="Template\uSoObjectKeeper.pas"/>
         <DCCReference Include="Parts\Rendition\uSoRenderer.pas"/>
         <DCCReference Include="Parts\Base\uSoBaseOperator.pas"/>
         <DCCReference Include="Parts\Formatters\uSoFormattor.pas"/>
@@ -262,10 +260,12 @@
         <DCCReference Include="Main\Container\uSoContainerKeeper.pas"/>
         <DCCReference Include="Main\Container\uSoContainerTypes.pas"/>
         <DCCReference Include="Parts\PositionAdapter\uSoPositionAdapter.pas"/>
+        <DCCReference Include="SoObject\uSoObject.pas"/>
+        <DCCReference Include="SoObject\uSoObjectKeeper.pas"/>
         <None Include="Utils\DelphiCompatability.inc"/>
-        <None Include="Template\uItemAdd.inc"/>
         <None Include="Utils\SimpleIoC.inc"/>
         <None Include="Parts\Collider\SoBox2D\Box2D\Physics2D.inc"/>
+        <None Include="SoObject\uItemAdd.inc"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -323,7 +323,16 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="ProjectOSXResource">
                     <Platform Name="OSX32">
                         <RemoteDir>Contents\Resources</RemoteDir>
@@ -635,16 +644,7 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                </DeployClass>
+                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>

diff --git a/SOEngine/Template/uItemAdd.inc → SOEngine/SoObject/uItemAdd.inc b/SOEngine/Template/uItemAdd.inc → SOEngine/SoObject/uItemAdd.inc
diff --git a/SOEngine/Template/uSoObject.pas → SOEngine/SoObject/uSoObject.pas b/SOEngine/Template/uSoObject.pas → SOEngine/SoObject/uSoObject.pas
diff --git a/SOEngine/Template/uSoObjectKeeper.pas → SOEngine/SoObject/uSoObjectKeeper.pas b/SOEngine/Template/uSoObjectKeeper.pas → SOEngine/SoObject/uSoObjectKeeper.pas
diff --git a/...RawFigures/TestRawShapeBox2DConverter.pas → ...RawFigures/TestRawShapeBox2DConverter.pas b/...RawFigures/TestRawShapeBox2DConverter.pas → ...RawFigures/TestRawShapeBox2DConverter.pas
diff --git a/.../RawFigures/TestRawShapeJsonConverter.pas → .../RawFigures/TestRawShapeJsonConverter.pas b/.../RawFigures/TestRawShapeJsonConverter.pas → .../RawFigures/TestRawShapeJsonConverter.pas
diff --git a/...oEngineTests/RawFigures/TestRawShapes.pas → SoEngineTests/RawFigures/TestRawShapes.pas b/...oEngineTests/RawFigures/TestRawShapes.pas → SoEngineTests/RawFigures/TestRawShapes.pas
diff --git a/...ests/RawFigures/uTestRawShapesHelpers.pas → ...ests/RawFigures/uTestRawShapesHelpers.pas b/...ests/RawFigures/uTestRawShapesHelpers.pas → ...ests/RawFigures/uTestRawShapesHelpers.pas
diff --git a/SOEngine/SoEngineTests/SOEngineTests.dpr → SoEngineTests/SOEngineTests.dpr b/SOEngine/SoEngineTests/SOEngineTests.dpr → SoEngineTests/SOEngineTests.dpr
diff --git a/SOEngine/SoEngineTests/SOEngineTests.dproj → SoEngineTests/SOEngineTests.dproj b/SOEngine/SoEngineTests/SOEngineTests.dproj → SoEngineTests/SOEngineTests.dproj