Merge pull request #86 from Vulpovile/cleanup/remove_aps_from_repo

Remove  .aps file from repo

.github/workflows/sync-develop.yml

@@ -0,0 +1,25 @@
+name: Sync Back to Develop
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  sync-branches:
+    runs-on: ubuntu-latest
+    name: Syncing branches
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - name: Opening pull request
+        id: pull
+        uses: tretuna/sync-branches@1.2.0
+        with:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          FROM_BRANCH: 'master'
+          TO_BRANCH: 'develop'

.gitignore

@@ -40,6 +40,9 @@
 *.ilk
 *.dep
 
+# ResEditor files
+*.aps
+
 /Debug
 /Release
 stdout.txt

Dialogs.rc

@@ -10,7 +10,7 @@
 #define APP_GENER 0
 #define APP_MAJOR 0
 #define APP_MINOR 106
-#define APP_PATCH 2
+#define APP_PATCH 3
 #define APP_VER_STRING APP_GENER.APP_MAJOR.APP_MINOR.APP_PATCH
 
 #define VER_PREFIX( N ) v##N

src/source/XplicitNgine/XplicitNgine.cpp

@@ -83,7 +83,9 @@ void XplicitNgine::createBody(PartInstance* partInstance)
 {
 	// calculate collisions
 	//dSpaceCollide (physSpace,0,&collisionCallback);
-    
+
+	Vector3 partSize = partInstance->getSize();
+	Vector3 partPosition = partInstance->getPosition();
 	if(partInstance->physBody == NULL) 
 	{
 		// init body
@@ -93,9 +95,9 @@ void XplicitNgine::createBody(PartInstance* partInstance)
 		if(partInstance->shape == Enum::Shape::Block)
 		{
 			partInstance->physGeom[0] = dCreateBox(physSpace,
-					partInstance->getSize()[0],
+					partSize.x,
-					partInstance->getSize()[1],
+					partSize.y,
-					partInstance->getSize()[2]
+					partSize.z
 				);
 
 			dVector3 result;
@@ -108,11 +110,11 @@ void XplicitNgine::createBody(PartInstance* partInstance)
 		}
 		else
 		{
-			partInstance->physGeom[0] = dCreateSphere(physSpace, partInstance->getSize()[0]/2);
+			partInstance->physGeom[0] = dCreateSphere(physSpace, partSize[0]/2);
 		}
 		
 		dMass mass;
-		mass.setBox(partInstance->getSize().x, partInstance->getSize().y, partInstance->getSize().z, 0.7F);
+		mass.setBox(partSize.x, partSize.y, partSize.z, 0.7F);
 		dBodySetMass(partInstance->physBody, &mass);
 
 		// Debug output
@@ -121,15 +123,15 @@ void XplicitNgine::createBody(PartInstance* partInstance)
 		// Create rigid body
 		//printf("[XplicitNgine] Created Geom for PartInstance\n");
 		dBodySetPosition(partInstance->physBody, 
-			partInstance->getPosition()[0],
+			partPosition.x,
-			partInstance->getPosition()[1],
+			partPosition.y,
-			partInstance->getPosition()[2]
+			partPosition.z
 		);
 
 		dGeomSetPosition(partInstance->physGeom[0], 
-			partInstance->getPosition()[0],
+			partPosition.x,
-			partInstance->getPosition()[1],
+			partPosition.y,
-			partInstance->getPosition()[2]);
+			partPosition.z);
 
 		Matrix3 g3dRot = partInstance->getCFrame().rotation;
 		float rotation [12] = {	g3dRot[0][0], g3dRot[0][1], g3dRot[0][2], 0,