Merge pull request #100 from Vulpovile/release/0.0.107.0

Release 0.0.107.0

.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

@@ -36,12 +36,13 @@
 *.user
 *.pdb
 *.idb
-*.manifest
-*.htm
 *.res
 *.ilk
 *.dep
 
+# ResEditor files
+*.aps
+
 /Debug
 /Release
 stdout.txt
@@ -56,3 +57,4 @@ desktop.ini
 
 #Redist
 !Installer/Redist/*
+UpgradeLog.htm

Blocks3D.exe.manifest

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
+		</dependentAssembly>
+	</dependency>
+</assembly>

Blocks3D.vcproj

@@ -49,7 +49,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;.\src\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
@@ -75,12 +79,17 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Advapi32.lib Comctl32.lib Comdlg32.lib Shell32.lib ode.lib OPCODE.lib Ole32.lib"
+				AdditionalDependencies="Advapi32.lib Comctl32.lib Comdlg32.lib Shell32.lib ode.lib Ole32.lib"
 				OutputFile="./Blocks3D.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/Blocks3D.pdb"
 				SubSystem="2"
+				StackReserveSize="16777216"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="2"
+				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -172,13 +181,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib Urlmon.lib ole32.lib oleaut32.lib uuid.lib ode.lib OPCODE.lib"
+				AdditionalDependencies="Advapi32.lib UxTheme.lib Comctl32.lib Comdlg32.lib Shell32.lib Urlmon.lib ole32.lib oleaut32.lib uuid.lib oded.lib"
 				OutputFile="./Blocks3D-Debug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/Blocks3D.pdb"
 				SubSystem="1"
+				StackReserveSize="16777216"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -491,6 +501,10 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath=".\src\source\DataModel\SelectionService.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\source\DataModelV2\WorkspaceInstance.cpp"
 					>
@@ -718,7 +732,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\resource.h"
+				RelativePath=".\src\include\resource.h"
 				>
 			</File>
 			<File
@@ -729,6 +743,14 @@
 				RelativePath=".\src\include\TextureHandler.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\include\ToolEnum.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\include\VS2005CompatShim.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\include\win32Defines.h"
 				>
@@ -840,6 +862,10 @@
 					RelativePath=".\src\include\DataModelV2\PVInstance.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\include\DataModelV2\SelectionService.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\include\DataModelV2\WorkspaceInstance.h"
 					>
@@ -898,6 +924,10 @@
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
+			<File
+				RelativePath=".\Blocks3D.exe.manifest"
+				>
+			</File>
 			<File
 				RelativePath=".\Dialogs.rc"
 				>

Dialogs.rc

@@ -6,6 +6,7 @@
 #include <commctrl.h>
 #include <richedit.h>
 #include "src/include/resource.h"
+#include "src/include/versioning.h"
 
 
 
@@ -16,7 +17,39 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
 IDB_BITMAP1        BITMAP         "Parts.bmp"
 
-
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+1 VERSIONINFO
+    FILEVERSION     APP_GENER,APP_MAJOR,APP_MINOR,APP_PATCH
+    PRODUCTVERSION  APP_GENER,APP_MAJOR,APP_MINOR,APP_PATCH
+    FILEOS          VOS__WINDOWS32
+    FILETYPE        VFT_APP
+    FILESUBTYPE     VFT2_UNKNOWN
+    FILEFLAGSMASK   0
+    FILEFLAGS       0
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "100901B5"
+        {
+            VALUE "Comments", ""
+            VALUE "CompanyName", "Blocks3D Team"
+            VALUE "FileDescription", "Blocks 3D"
+            VALUE "FileVersion", VER_STR(APP_VER_STRING)
+            VALUE "InternalName", "Blocks3D"
+            VALUE "LegalCopyright", "Blocks3D Team - 2022"
+            VALUE "LegalTrademarks", ""
+            VALUE "OriginalFilename", "Blocks3D.exe"
+            VALUE "PrivateBuild", ""
+            VALUE "ProductName", "Blocks3D"
+            VALUE "ProductVersion", VER_STR(APP_VER_STRING)
+            VALUE "SpecialBuild", ""
+        }
+    }
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x1009, 0x01B5
+    }
+}
 
 //
 // Dialog resources
@@ -41,3 +74,13 @@ FONT 8, "Ms Shell Dlg"
 //
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
 IDI_ICON1          ICON           "FatB3dIcon.ico"
+
+
+
+//
+// Manifest resources
+//
+#ifndef _DEBUG
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+1				MANIFEST    ".\\Blocks3D.exe.manifest"
+#endif

Installer/install_script.iss

@@ -1,14 +1,15 @@
 ;InnoSetupVersion=5.4.3
+#define AppVer GetFileVersion('..\Blocks3D.exe')
 
 [Setup]
 AppName=Blocks3D
+AppVersion=v{#AppVer}
 AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
-AppVersion=v0.0.105.0
 AppPublisherURL=http://blocks3d.com/
 AppSupportURL=http://blocks3d.com/
 AppUpdatesURL=http://blocks3d.com/
 DefaultDirName={%localappdata}\Blocks3D
-OutputBaseFilename=Blocks3D_Setup_{#SetupSetting("AppVersion")}
+OutputBaseFilename=Blocks3D_Setup_v{#AppVer}
 Compression=lzma2
 PrivilegesRequired=lowest
 WizardImageFile=setup.bmp

Physics Test/Cylinder.rbxl

@@ -0,0 +1,588 @@
+<roblox xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.roblox.com/roblox.xsd" version="4">
+	<External>null</External>
+	<External>nil</External>
+	<Item class="Workspace" referent="RBX0">
+		<Properties>
+			<token name="Controller">0</token>
+			<bool name="ControllerFlagShown">true</bool>
+			<Ref name="CurrentCamera">RBX1</Ref>
+			<double name="DistributedGameTime">0</double>
+			<CoordinateFrame name="ModelInPrimary">
+				<X>0</X>
+				<Y>0</Y>
+				<Z>0</Z>
+				<R00>1</R00>
+				<R01>0</R01>
+				<R02>0</R02>
+				<R10>0</R10>
+				<R11>1</R11>
+				<R12>0</R12>
+				<R20>0</R20>
+				<R21>0</R21>
+				<R22>1</R22>
+			</CoordinateFrame>
+			<string name="Name">Workspace</string>
+			<Ref name="PrimaryPart">null</Ref>
+			<bool name="archivable">true</bool>
+		</Properties>
+		<Item class="Camera" referent="RBX1">
+			<Properties>
+				<Ref name="CameraSubject">null</Ref>
+				<token name="CameraType">0</token>
+				<CoordinateFrame name="CoordinateFrame">
+					<X>-2.9603548</X>
+					<Y>115.389259</Y>
+					<Z>44.9416084</Z>
+					<R00>0.112786211</R00>
+					<R01>0.522245169</R01>
+					<R02>-0.845304191</R02>
+					<R10>-2.22539209e-009</R10>
+					<R11>0.850732446</R11>
+					<R12>0.525598884</R12>
+					<R20>0.993619263</R20>
+					<R21>-0.0592803061</R21>
+					<R22>0.0959508941</R22>
+				</CoordinateFrame>
+				<CoordinateFrame name="Focus">
+					<X>13.9457293</X>
+					<Y>104.877281</Y>
+					<Z>43.0225906</Z>
+					<R00>1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>1</R22>
+				</CoordinateFrame>
+				<string name="Name">Camera</string>
+				<bool name="archivable">true</bool>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX2">
+			<Properties>
+				<bool name="Anchored">false</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">0</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">21</int>
+				<CoordinateFrame name="CFrame">
+					<X>87.0174942</X>
+					<Y>48.0466728</Y>
+					<Z>25.0001202</Z>
+					<R00>-0.969314575</R00>
+					<R01>0.245822206</R01>
+					<R02>4.6762093e-006</R02>
+					<R10>0.245822206</R10>
+					<R11>0.969314933</R11>
+					<R12>6.9744442e-007</R12>
+					<R20>-4.35209677e-006</R20>
+					<R21>1.87532066e-006</R21>
+					<R22>-0.999999642</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Smooth Block Model</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">0</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">2</token>
+				<Vector3 name="size">
+					<X>6</X>
+					<Y>6</Y>
+					<Z>6</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX3">
+			<Properties>
+				<bool name="Anchored">true</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">4</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">23</int>
+				<CoordinateFrame name="CFrame">
+					<X>108.911415</X>
+					<Y>38.7803154</Y>
+					<Z>27.5002155</Z>
+					<R00>-0.969314575</R00>
+					<R01>0.245822206</R01>
+					<R02>4.6762093e-006</R02>
+					<R10>0.245822206</R10>
+					<R11>0.969314933</R11>
+					<R12>6.9744442e-007</R12>
+					<R20>-4.35209677e-006</R20>
+					<R21>1.87532066e-006</R21>
+					<R22>-0.999999642</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">1</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Smooth Block Model</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">3</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>53</X>
+					<Y>1.20000005</Y>
+					<Z>1</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX4">
+			<Properties>
+				<bool name="Anchored">true</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">4</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">23</int>
+				<CoordinateFrame name="CFrame">
+					<X>141.499893</X>
+					<Y>38.1177788</Y>
+					<Z>27.0499611</Z>
+					<R00>1</R00>
+					<R01>-1.07914104e-006</R01>
+					<R02>-4.49890285e-006</R02>
+					<R10>-5.98966139e-008</R10>
+					<R11>0.969315231</R11>
+					<R12>-0.245820925</R12>
+					<R20>4.6261307e-006</R20>
+					<R21>0.245820925</R21>
+					<R22>0.969315231</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">1</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Smooth Block Model</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">3</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>1</X>
+					<Y>16.8000011</Y>
+					<Z>12</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX5">
+			<Properties>
+				<bool name="Anchored">true</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">4</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">23</int>
+				<CoordinateFrame name="CFrame">
+					<X>108.911438</X>
+					<Y>38.7803192</Y>
+					<Z>22.5002174</Z>
+					<R00>-0.969314575</R00>
+					<R01>0.245822206</R01>
+					<R02>4.6762093e-006</R02>
+					<R10>0.245822206</R10>
+					<R11>0.969314933</R11>
+					<R12>6.9744442e-007</R12>
+					<R20>-4.35209677e-006</R20>
+					<R21>1.87532066e-006</R21>
+					<R22>-0.999999642</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">1</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Smooth Block Model</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">3</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>53</X>
+					<Y>1.20000005</Y>
+					<Z>1</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX6">
+			<Properties>
+				<bool name="Anchored">true</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">4</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">23</int>
+				<CoordinateFrame name="CFrame">
+					<X>140.499786</X>
+					<Y>24.7802944</Y>
+					<Z>47.911438</Z>
+					<R00>4.35209677e-006</R00>
+					<R01>-1.87532066e-006</R01>
+					<R02>0.999999642</R02>
+					<R10>0.245822206</R10>
+					<R11>0.969314933</R11>
+					<R12>6.9744442e-007</R12>
+					<R20>-0.969314575</R20>
+					<R21>0.245822206</R21>
+					<R22>4.6762093e-006</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">1</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Smooth Block Model</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">3</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>53</X>
+					<Y>1.20000005</Y>
+					<Z>1</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX7">
+			<Properties>
+				<bool name="Anchored">true</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">4</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">23</int>
+				<CoordinateFrame name="CFrame">
+					<X>135.499786</X>
+					<Y>24.7802944</Y>
+					<Z>47.9114227</Z>
+					<R00>4.35515585e-006</R00>
+					<R01>-1.85873387e-006</R01>
+					<R02>0.999999881</R02>
+					<R10>0.245822236</R10>
+					<R11>0.969314933</R11>
+					<R12>7.14274279e-007</R12>
+					<R20>-0.969314814</R20>
+					<R21>0.245822236</R21>
+					<R22>4.67732343e-006</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">1</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Smooth Block Model</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">3</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>53</X>
+					<Y>1.20000005</Y>
+					<Z>1</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+	</Item>
+	<Item class="RunService" referent="RBX8">
+		<Properties>
+			<string name="Name">Run Service</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<External>RBX9</External>
+	<External>RBX10</External>
+	<Item class="Players" referent="RBX11">
+		<Properties>
+			<int name="MaxPlayers">12</int>
+			<string name="Name">Players</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="StarterPack" referent="RBX12">
+		<Properties>
+			<string name="Name">StarterPack</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="SoundService" referent="RBX13">
+		<Properties>
+			<token name="AmbientReverb">0</token>
+			<float name="DistanceFactor">10</float>
+			<float name="DopplerScale">1</float>
+			<string name="Name">Soundscape</string>
+			<float name="RolloffScale">1</float>
+			<bool name="archivable">true</bool>
+		</Properties>
+		<External>RBX14</External>
+		<External>RBX15</External>
+		<External>RBX16</External>
+		<External>RBX17</External>
+		<External>RBX18</External>
+		<External>RBX19</External>
+		<External>RBX20</External>
+		<External>RBX21</External>
+		<External>RBX22</External>
+		<External>RBX23</External>
+		<External>RBX24</External>
+		<External>RBX25</External>
+		<External>RBX26</External>
+		<External>RBX27</External>
+	</Item>
+	<Item class="ContentProvider" referent="RBX28">
+		<Properties>
+			<string name="Name">Instance</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="PhysicsService" referent="RBX29">
+		<Properties>
+			<string name="Name">PhysicsService</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<External>RBX30</External>
+	<Item class="Selection" referent="RBX31">
+		<Properties>
+			<string name="Name">Selection</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<External>RBX32</External>
+	<Item class="Lighting" referent="RBX33">
+		<Properties>
+			<Color3 name="Ambient">4286940549</Color3>
+			<float name="Brightness">1</float>
+			<Color3 name="ColorShift_Bottom">4278190080</Color3>
+			<Color3 name="ColorShift_Top">4278190080</Color3>
+			<float name="GeographicLatitude">41.7332993</float>
+			<string name="Name">Lighting</string>
+			<Color3 name="ShadowColor">4290295997</Color3>
+			<string name="TimeOfDay">14:00:00</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="ControllerService" referent="RBX34">
+		<Properties>
+			<string name="Name">Instance</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="ChangeHistoryService" referent="RBX35">
+		<Properties>
+			<string name="Name">ChangeHistoryService</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<External>RBX36</External>
+</roblox>

Physics Test/phys_test_004.rbxl

@@ -0,0 +1,578 @@
+<roblox xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.roblox.com/roblox.xsd" version="4">
+	<External>null</External>
+	<External>nil</External>
+	<Item class="RunService">
+		<Properties>
+			<string name="Name">Run Service</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="Selection">
+		<Properties>
+			<string name="Name">Selection</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="Workspace">
+		<Properties>
+			<token name="Controller">0</token>
+			<bool name="ControllerFlagShown">true</bool>
+			<Ref name="CurrentCamera">RBX0</Ref>
+			<CoordinateFrame name="ModelInPrimary">
+				<X>0</X>
+				<Y>0</Y>
+				<Z>0</Z>
+				<R00>1</R00>
+				<R01>0</R01>
+				<R02>0</R02>
+				<R10>0</R10>
+				<R11>1</R11>
+				<R12>0</R12>
+				<R20>0</R20>
+				<R21>0</R21>
+				<R22>1</R22>
+			</CoordinateFrame>
+			<string name="Name">Workspace</string>
+			<Ref name="PrimaryPart">RBX1</Ref>
+			<bool name="archivable">true</bool>
+		</Properties>
+		<Item class="Camera" referent="RBX0">
+			<Properties>
+				<Ref name="CameraSubject">null</Ref>
+				<token name="CameraType">0</token>
+				<CoordinateFrame name="CoordinateFrame">
+					<X>202.42688</X>
+					<Y>55.4607582</Y>
+					<Z>3.2956109</Z>
+					<R00>0.0106770508</R00>
+					<R01>0.00328579429</R01>
+					<R02>0.999937654</R02>
+					<R10>4.65661287e-010</R10>
+					<R11>0.999994576</R11>
+					<R12>-0.00328598148</R12>
+					<R20>-0.999943018</R20>
+					<R21>3.50852497e-005</R21>
+					<R22>0.010676994</R22>
+				</CoordinateFrame>
+				<CoordinateFrame name="Focus">
+					<X>182.428116</X>
+					<Y>55.5264778</Y>
+					<Z>3.08207107</Z>
+					<R00>1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>1</R22>
+				</CoordinateFrame>
+				<string name="Name">Camera</string>
+				<bool name="archivable">true</bool>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX1">
+			<Properties>
+				<bool name="Anchored">true</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">0</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">37</int>
+				<CoordinateFrame name="CFrame">
+					<X>0</X>
+					<Y>2.79999995</Y>
+					<Z>-4</Z>
+					<R00>1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<bool name="CastsShadows">false</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="Cullable">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">true</bool>
+				<string name="Name">Part</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">0</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>64</X>
+					<Y>1</Y>
+					<Z>248</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part">
+			<Properties>
+				<bool name="Anchored">false</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">0</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">23</int>
+				<CoordinateFrame name="CFrame">
+					<X>0</X>
+					<Y>78.3000031</Y>
+					<Z>-96</Z>
+					<R00>1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<bool name="CastsShadows">false</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="Cullable">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Part</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">0</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>2</X>
+					<Y>2</Y>
+					<Z>2</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part">
+			<Properties>
+				<bool name="Anchored">false</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">0</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">23</int>
+				<CoordinateFrame name="CFrame">
+					<X>0</X>
+					<Y>79.3000031</Y>
+					<Z>-62</Z>
+					<R00>1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<bool name="CastsShadows">false</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="Cullable">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Part</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">0</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>4</X>
+					<Y>4</Y>
+					<Z>4</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part">
+			<Properties>
+				<bool name="Anchored">false</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">0</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">23</int>
+				<CoordinateFrame name="CFrame">
+					<X>0</X>
+					<Y>81.3000031</Y>
+					<Z>-25</Z>
+					<R00>1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<bool name="CastsShadows">false</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="Cullable">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Part</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">0</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>8</X>
+					<Y>8</Y>
+					<Z>8</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part">
+			<Properties>
+				<bool name="Anchored">false</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">0</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">23</int>
+				<CoordinateFrame name="CFrame">
+					<X>0</X>
+					<Y>85.3000031</Y>
+					<Z>18</Z>
+					<R00>1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<bool name="CastsShadows">false</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="Cullable">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Part</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">0</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>16</X>
+					<Y>16</Y>
+					<Z>16</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part">
+			<Properties>
+				<bool name="Anchored">false</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">0</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">23</int>
+				<CoordinateFrame name="CFrame">
+					<X>0</X>
+					<Y>93.3000031</Y>
+					<Z>73</Z>
+					<R00>1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<bool name="CastsShadows">false</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="Cullable">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Part</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">0</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>32</X>
+					<Y>32</Y>
+					<Z>32</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+	</Item>
+	<External>RBX2</External>
+	<External>RBX3</External>
+	<Item class="Players">
+		<Properties>
+			<string name="Name">Players</string>
+			<bool name="archivable">true</bool>
+			<int name="maxPlayers">10</int>
+		</Properties>
+	</Item>
+	<Item class="StarterPack">
+		<Properties>
+			<string name="Name">StarterPack</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="SoundService">
+		<Properties>
+			<string name="Name">SoundService</string>
+			<bool name="archivable">true</bool>
+			<float name="distancefactor">10</float>
+			<float name="dopplerscale">1</float>
+			<float name="rolloffscale">1</float>
+		</Properties>
+		<External>RBX4</External>
+		<External>RBX5</External>
+		<External>RBX6</External>
+		<External>RBX7</External>
+		<External>RBX8</External>
+		<External>RBX9</External>
+		<External>RBX10</External>
+		<External>RBX11</External>
+		<External>RBX12</External>
+		<External>RBX13</External>
+		<External>RBX14</External>
+		<External>RBX15</External>
+		<External>RBX16</External>
+		<External>RBX17</External>
+	</Item>
+	<Item class="Lighting">
+		<Properties>
+			<Color3 name="BottomAmbientV9">4286220152</Color3>
+			<Color3 name="ClearColor">4278190080</Color3>
+			<string name="Name">Lighting</string>
+			<Color3 name="SpotLightV9">4290822336</Color3>
+			<string name="TimeOfDay">14:00:00</string>
+			<Color3 name="TopAmbientV9">4292006362</Color3>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="ControllerService">
+		<Properties>
+			<string name="Name">Instance</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<External>RBX18</External>
+	<External>RBX19</External>
+	<External>RBX20</External>
+</roblox>

Physics Test/phys_test_stable.rbxl

@@ -0,0 +1,660 @@
+<roblox xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.roblox.com/roblox.xsd" version="4">
+	<External>null</External>
+	<External>nil</External>
+	<Item class="Workspace" referent="RBX0">
+		<Properties>
+			<token name="Controller">0</token>
+			<bool name="ControllerFlagShown">true</bool>
+			<Ref name="CurrentCamera">RBX1</Ref>
+			<double name="DistributedGameTime">0</double>
+			<CoordinateFrame name="ModelInPrimary">
+				<X>0</X>
+				<Y>0</Y>
+				<Z>0</Z>
+				<R00>1</R00>
+				<R01>0</R01>
+				<R02>0</R02>
+				<R10>0</R10>
+				<R11>1</R11>
+				<R12>0</R12>
+				<R20>0</R20>
+				<R21>0</R21>
+				<R22>1</R22>
+			</CoordinateFrame>
+			<string name="Name">Workspace</string>
+			<Ref name="PrimaryPart">null</Ref>
+			<bool name="archivable">true</bool>
+		</Properties>
+		<Item class="Camera" referent="RBX1">
+			<Properties>
+				<Ref name="CameraSubject">null</Ref>
+				<token name="CameraType">0</token>
+				<CoordinateFrame name="CoordinateFrame">
+					<X>-62.3436203</X>
+					<Y>290.964996</Y>
+					<Z>130.047195</Z>
+					<R00>0.900759101</R00>
+					<R01>0.385544956</R01>
+					<R02>-0.199970409</R02>
+					<R10>3.07713033e-009</R10>
+					<R11>0.460422784</R11>
+					<R12>0.887699783</R12>
+					<R20>0.434319079</R20>
+					<R21>-0.799603641</R21>
+					<R22>0.414730012</R22>
+				</CoordinateFrame>
+				<CoordinateFrame name="Focus">
+					<X>-58.3442116</X>
+					<Y>273.210999</Y>
+					<Z>121.752594</Z>
+					<R00>1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>1</R22>
+				</CoordinateFrame>
+				<string name="Name">Camera</string>
+				<bool name="archivable">true</bool>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX2">
+			<Properties>
+				<bool name="Anchored">true</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">4</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">37</int>
+				<CoordinateFrame name="CFrame">
+					<X>0</X>
+					<Y>0.600000024</Y>
+					<Z>0</Z>
+					<R00>-1</R00>
+					<R01>0</R01>
+					<R02>-0</R02>
+					<R10>-0</R10>
+					<R11>1</R11>
+					<R12>-0</R12>
+					<R20>-0</R20>
+					<R21>0</R21>
+					<R22>-1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">1</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">true</bool>
+				<string name="Name">Baseplate</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">3</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>512</X>
+					<Y>1.20000005</Y>
+					<Z>512</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX3">
+			<Properties>
+				<bool name="Anchored">false</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">4</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">28</int>
+				<CoordinateFrame name="CFrame">
+					<X>-2</X>
+					<Y>5.69999981</Y>
+					<Z>1</Z>
+					<R00>-1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>-1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Smooth Block Model</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">3</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>2</X>
+					<Y>9</Y>
+					<Z>2</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX4">
+			<Properties>
+				<bool name="Anchored">false</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">4</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">28</int>
+				<CoordinateFrame name="CFrame">
+					<X>6</X>
+					<Y>5.69999981</Y>
+					<Z>1</Z>
+					<R00>-1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>-1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Smooth Block Model</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">3</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>2</X>
+					<Y>9</Y>
+					<Z>2</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX5">
+			<Properties>
+				<bool name="Anchored">false</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">4</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">28</int>
+				<CoordinateFrame name="CFrame">
+					<X>6</X>
+					<Y>5.69999981</Y>
+					<Z>-7</Z>
+					<R00>-1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>-1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Smooth Block Model</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">3</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>2</X>
+					<Y>9</Y>
+					<Z>2</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX6">
+			<Properties>
+				<bool name="Anchored">false</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">4</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">28</int>
+				<CoordinateFrame name="CFrame">
+					<X>-2</X>
+					<Y>5.69999981</Y>
+					<Z>-7</Z>
+					<R00>-1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>-1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Smooth Block Model</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">3</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>2</X>
+					<Y>9</Y>
+					<Z>2</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX7">
+			<Properties>
+				<bool name="Anchored">false</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">4</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">28</int>
+				<CoordinateFrame name="CFrame">
+					<X>2</X>
+					<Y>11.1999998</Y>
+					<Z>-3</Z>
+					<R00>-1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>-1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Smooth Block Model</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">3</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>10</X>
+					<Y>2</Y>
+					<Z>10</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+		<Item class="Part" referent="RBX8">
+			<Properties>
+				<bool name="Anchored">false</bool>
+				<float name="BackParamA">-0.5</float>
+				<float name="BackParamB">0.5</float>
+				<token name="BackSurface">0</token>
+				<token name="BackSurfaceInput">0</token>
+				<float name="BottomParamA">-0.5</float>
+				<float name="BottomParamB">0.5</float>
+				<token name="BottomSurface">4</token>
+				<token name="BottomSurfaceInput">0</token>
+				<int name="BrickColor">28</int>
+				<CoordinateFrame name="CFrame">
+					<X>2</X>
+					<Y>13.1999998</Y>
+					<Z>-3</Z>
+					<R00>-1</R00>
+					<R01>0</R01>
+					<R02>0</R02>
+					<R10>0</R10>
+					<R11>1</R11>
+					<R12>0</R12>
+					<R20>0</R20>
+					<R21>0</R21>
+					<R22>-1</R22>
+				</CoordinateFrame>
+				<bool name="CanCollide">true</bool>
+				<token name="Controller">0</token>
+				<bool name="ControllerFlagShown">true</bool>
+				<bool name="DraggingV1">false</bool>
+				<float name="Elasticity">0.5</float>
+				<token name="FormFactor">0</token>
+				<float name="Friction">0.300000012</float>
+				<float name="FrontParamA">-0.5</float>
+				<float name="FrontParamB">0.5</float>
+				<token name="FrontSurface">0</token>
+				<token name="FrontSurfaceInput">0</token>
+				<float name="LeftParamA">-0.5</float>
+				<float name="LeftParamB">0.5</float>
+				<token name="LeftSurface">0</token>
+				<token name="LeftSurfaceInput">0</token>
+				<bool name="Locked">false</bool>
+				<string name="Name">Smooth Block Model</string>
+				<float name="Reflectance">0</float>
+				<float name="RightParamA">-0.5</float>
+				<float name="RightParamB">0.5</float>
+				<token name="RightSurface">0</token>
+				<token name="RightSurfaceInput">0</token>
+				<Vector3 name="RotVelocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<float name="TopParamA">-0.5</float>
+				<float name="TopParamB">0.5</float>
+				<token name="TopSurface">3</token>
+				<token name="TopSurfaceInput">0</token>
+				<float name="Transparency">0</float>
+				<Vector3 name="Velocity">
+					<X>0</X>
+					<Y>0</Y>
+					<Z>0</Z>
+				</Vector3>
+				<bool name="archivable">true</bool>
+				<token name="shape">1</token>
+				<Vector3 name="size">
+					<X>6</X>
+					<Y>2</Y>
+					<Z>6</Z>
+				</Vector3>
+			</Properties>
+		</Item>
+	</Item>
+	<Item class="RunService" referent="RBX9">
+		<Properties>
+			<string name="Name">Run Service</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<External>RBX10</External>
+	<External>RBX11</External>
+	<Item class="Players" referent="RBX12">
+		<Properties>
+			<int name="MaxPlayers">12</int>
+			<string name="Name">Players</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="StarterPack" referent="RBX13">
+		<Properties>
+			<string name="Name">StarterPack</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="SoundService" referent="RBX14">
+		<Properties>
+			<token name="AmbientReverb">0</token>
+			<float name="DistanceFactor">10</float>
+			<float name="DopplerScale">1</float>
+			<string name="Name">Soundscape</string>
+			<float name="RolloffScale">1</float>
+			<bool name="archivable">true</bool>
+		</Properties>
+		<External>RBX15</External>
+		<External>RBX16</External>
+		<External>RBX17</External>
+		<External>RBX18</External>
+		<External>RBX19</External>
+		<External>RBX20</External>
+		<External>RBX21</External>
+		<External>RBX22</External>
+		<External>RBX23</External>
+		<External>RBX24</External>
+		<External>RBX25</External>
+		<External>RBX26</External>
+		<External>RBX27</External>
+		<External>RBX28</External>
+	</Item>
+	<Item class="ContentProvider" referent="RBX29">
+		<Properties>
+			<string name="Name">Instance</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="PhysicsService" referent="RBX30">
+		<Properties>
+			<string name="Name">PhysicsService</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<External>RBX31</External>
+	<Item class="Selection" referent="RBX32">
+		<Properties>
+			<string name="Name">Selection</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<External>RBX33</External>
+	<Item class="Lighting" referent="RBX34">
+		<Properties>
+			<Color3 name="Ambient">4286611584</Color3>
+			<float name="Brightness">1</float>
+			<Color3 name="ColorShift_Bottom">4278190080</Color3>
+			<Color3 name="ColorShift_Top">4278190080</Color3>
+			<float name="GeographicLatitude">41.7332993</float>
+			<string name="Name">Lighting</string>
+			<Color3 name="ShadowColor">4289967032</Color3>
+			<string name="TimeOfDay">14:00:00</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="ControllerService" referent="RBX35">
+		<Properties>
+			<string name="Name">Instance</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<Item class="ChangeHistoryService" referent="RBX36">
+		<Properties>
+			<string name="Name">ChangeHistoryService</string>
+			<bool name="archivable">true</bool>
+		</Properties>
+	</Item>
+	<External>RBX37</External>
+</roblox>

content/page/hopper.html

@@ -22,7 +22,7 @@
 	}
 </style>
 <body style="background-color: ButtonFace; margin: 0; padding: 5px; overflow: hidden; border: outset 2px;">
-	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="alert(window.external.ToggleHopperBin(0))">
+	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(0)">
 		<img src="../images/GameTool.png" />
 	</span>
 	<span class="container" onmousedown="toolOvr(this)" onmouseup="toolOut(this)" onmouseout="toolOut(this)" onclick="window.external.ToggleHopperBin(1)">

src/include/Application.h

@@ -32,7 +32,6 @@ class Application { // : public GApp {
 		PartInstance*	makePart();
 		void			drawButtons(RenderDevice* rd);
 		void			drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, LightingParameters lighting, Vector3 size, Vector3 pos, CoordinateFrame c);
-		std::vector<Instance*>	getSelection();
 		void		deleteInstance();
 		void		run();
 		void		QuitApp();
@@ -60,6 +59,7 @@ class Application { // : public GApp {
 		Tool * tool;
 		void changeTool(Tool *);
 		Mouse mouse;
+		bool		viewportHasFocus();
 	private:
 		bool				mouseMoveState;
 		RenderDevice*		renderDevice;

src/include/DataModelV2/DataModelInstance.h

@@ -2,6 +2,7 @@
 #include "WorkspaceInstance.h"
 #include "LevelInstance.h"
 #include "PartInstance.h"
+#include "SelectionService.h"
 #include "rapidxml/rapidxml.hpp"
 #include "GuiRootInstance.h"
 #include "XplicitNgine/XplicitNgine.h"
@@ -30,12 +31,7 @@ public:
 	bool					showMessage;
 	G3D::GFontRef			font;
 	GuiRootInstance*		getGuiRoot();
-	//float					mousex;
+	SelectionService*		getSelectionService();
-	//float					mousey;
-	//Vector2					getMousePos();
-	//void					setMousePos(int x,int y);
-	//void					setMousePos(Vector2 pos);
-	//bool					mouseButton1Down;
 	PartInstance*			makePart();
 	void					clearLevel();
 	void					toggleRun();
@@ -56,6 +52,7 @@ private:
 	WorkspaceInstance*		workspace;
 	LevelInstance *			level;
 	GuiRootInstance*		guiRoot;
+	SelectionService*		selectionService;
 	bool					running;
 	XplicitNgine *			xplicitNgine;
 };

src/include/DataModelV2/LevelInstance.h

@@ -7,10 +7,19 @@ class LevelInstance :
 public:
 	LevelInstance(void);
 	~LevelInstance(void);
+	bool HighScoreIsGood;
+	Enum::ActionType::Value TimerUpAction;
+	Enum::AffectType::Value TimerAffectsScore;
+	bool RunOnOpen;
 	float timer;
 	int score;
 	virtual std::vector<PROPGRIDITEM> getProperties();
 	std::string winMessage;
 	std::string loseMessage;
 	virtual void PropUpdate(LPPROPGRIDITEM &pItem);
+	void winCondition();
+	void loseCondition();
+	void pauseCondition();
+	void drawCondition();
+	void Step(SimTime sdt);
 };

src/include/DataModelV2/SelectionService.h

@@ -0,0 +1,21 @@
+#pragma once
+#include "Instance.h"
+#include "PropertyWindow.h"
+
+class SelectionService : public Instance
+{
+public:
+	SelectionService(void);
+	~SelectionService(void);
+	SelectionService(const SelectionService &oinst);
+	std::vector<Instance *> getSelection();
+	void clearSelection();
+	bool isSelected(Instance * instance);
+	void addSelected(Instance * instance);
+	void removeSelected(Instance * instance);
+	void addSelected(const std::vector<Instance *> &instances);
+	void setPropertyWindow(PropertyWindow * propertyWindow);
+private:
+	std::vector<Instance *> selection;
+	PropertyWindow * propertyWindow;
+};

src/include/Enum.h

@@ -20,4 +20,16 @@ namespace Enum
 			Player = 7, KeyboardRight = 1, KeyboardLeft = 2, Joypad1 = 3, Joypad2 = 4, Chase = 5, Flee = 6, None = 0
 		};
 	}
+	namespace ActionType
+	{
+		enum Value {
+			Nothing = 0, Pause = 1, Lose = 2, Draw = 3, Win = 4
+		};
+	}
+	namespace AffectType
+	{
+		enum Value {
+			NoChange = 0, Increase = 1, Decrease = 2
+		};
+	}
 }

src/include/Globals.h

@@ -25,7 +25,6 @@ public:
 };
 
 extern std::vector<Instance*> postRenderStack;
-extern std::vector<Instance*> g_selectedInstances;
 extern bool running;
 extern DataModelInstance* g_dataModel;
 extern XplicitNgine* g_xplicitNgine;

src/include/PropertyWindow.h

@@ -5,13 +5,14 @@ class PropertyWindow {
 public:
 	PropertyWindow(int x, int y, int sx, int sy, HMODULE hThisInstance);
 	bool	onCreate(int x, int y, int sx, int sy, HMODULE hThisInstance);
-	void	UpdateSelected(Instance *);
+	void	UpdateSelected(std::vector<Instance *> selection);
 	void	ClearProperties();
 	void	onResize();
-	void	refreshExplorer(Instance* selectedInstance);
+	void	refreshExplorer(std::vector<Instance *> selection);
 	HWND	_hwndProp;
 private:
 	HWND	_propGrid;
 	HWND	_explorerComboBox;
 	void	_resize();
+	void	clearExplorer();
 };

src/include/Tool/ArrowTool.h

@@ -13,6 +13,7 @@ public:
 	void onSelect(Mouse mouse); 
 	void onKeyDown(int key);
 	void onKeyUp(int key);
+	void roundDeg(float &degree);
 private:
 	bool lctrlDown;
 	bool rctrlDown;
@@ -20,4 +21,5 @@ private:
 	int mouseDownStarty;
 	bool dragging;
 	bool mouseDown;
+	Vector3 draggingPartOffset;
 };

src/include/ToolEnum.h

@@ -0,0 +1,11 @@
+#pragma once
+
+namespace Enum
+{
+	namespace Hopper
+	{
+		enum Value {
+			GameTool = 0, Grab = 1, Clone = 2, Hammer = 3, Slingshot = 4, Rocket = 5, Laser = 6
+		};
+	}
+}

src/include/VS2005CompatShim.h

@@ -0,0 +1,26 @@
+#ifndef COMPAT_SHIM
+#define COMPAT_SHIM
+#include <sstream>
+#include <string>
+
+template<class T>
+std::string toString(const T &value)
+{
+	std::ostringstream os;
+	os << value;
+	return os.str();
+}
+
+namespace std
+{
+	std::string to_string( int value ) {return toString(value);}
+	std::string to_string( long value ) {return toString(value);}
+	std::string to_string( long long value ) {return toString(value);}
+	std::string to_string( unsigned value ) {return toString(value);}
+	std::string to_string( unsigned long value ) {return toString(value);}
+	std::string to_string( unsigned long long value ) {return toString(value);}
+	std::string to_string( float value ) {return toString(value);}
+	std::string to_string( double value ) {return toString(value);}
+	std::string to_string( long double value ) {return toString(value);}
+}
+#endif

src/include/XplicitNgine/XplicitNgine.h

@@ -15,5 +15,5 @@ public:
 	void step(float stepSize);
 	void createBody(PartInstance* partInstance);
 	void deleteBody(PartInstance* partInstance);
-	void updateBody(PartInstance* partInstance, CoordinateFrame * cFrame);
+	void updateBody(PartInstance* partInstance);
 };

src/include/versioning.h

@@ -0,0 +1,23 @@
+#ifndef APP_GENER
+
+//#define SNAPSHOT_VERSION
+
+#define APP_GENER 0
+#define APP_MAJOR 0
+#define APP_MINOR 107
+#define APP_PATCH 0
+#define APP_VER_STRING APP_GENER.APP_MAJOR.APP_MINOR.APP_PATCH
+
+
+#ifdef SNAPSHOT_VERSION
+#define VER_PREFIX( N ) v##N-SNAPSHOT
+#else
+#define VER_PREFIX( N ) v##N
+#endif
+
+
+#define HSTR( N ) #N
+#define STR( N ) HSTR( N )
+#define VER_STR( N ) STR( VER_PREFIX( N ) )
+
+#endif

src/source/Application.cpp

@@ -143,6 +143,11 @@ Application::Application(HWND parentWindow) : _propWindow(NULL) { //: GApp(setti
 
 }
 
+bool Application::viewportHasFocus()
+{
+	return GetActiveWindow() == this->_hWndMain;
+}
+
 void Application::navigateToolbox(std::string path)
 {
 	int len = path.size() + 1;
@@ -154,28 +159,29 @@ void Application::navigateToolbox(std::string path)
 
 void Application::deleteInstance()
 {
-	if(g_selectedInstances.size() > 0)
+	if(_dataModel->getSelectionService()->getSelection().size() > 0)
 	{
-		size_t undeletable = 0;
+		std::vector<Instance *> selection = _dataModel->getSelectionService()->getSelection();
-		while(g_selectedInstances.size() > undeletable)
+		std::vector<Instance *> toDelete;
-		{
+		for(size_t i = 0; i < selection.size(); i++) {
-			if(g_selectedInstances.at(0)->canDelete)
+			if(selection[i]->canDelete) {
+				toDelete.push_back(selection[i]);
+			}
+		}
+		if(toDelete.size() > 0)
 		{
 			AudioPlayer::playSound(GetFileInPath("/content/sounds/pageturn.wav"));
-				Instance* selectedInstance = g_selectedInstances.at(0);
+			for(size_t i = 0; i < toDelete.size(); i++) {
+				Instance* selectedInstance = toDelete[i];
+				_dataModel->getSelectionService()->removeSelected(selectedInstance);
 				selectedInstance->setParent(NULL);
 				delete selectedInstance;
 				selectedInstance = NULL;
-				g_selectedInstances.erase(g_selectedInstances.begin());
-			}
-			else
-			{
-				undeletable++;
 			}
 		}
 	}
-	if(g_selectedInstances.size() == 0)
+	if(_dataModel->getSelectionService()->getSelection().size() == 0)
-		g_usableApp->_propWindow->ClearProperties();
+		_dataModel->getSelectionService()->addSelected(_dataModel);
 }
 
 
@@ -280,6 +286,8 @@ void Application::onInit()  {
 	_dataModel->debugGetOpen();
 #endif
 	
+	_dataModel->getSelectionService()->clearSelection();
+	_dataModel->getSelectionService()->addSelected(_dataModel);
 
 
 
@@ -311,14 +319,13 @@ void Application::onNetwork() {
 //	return pow(pow((double)vector1.x - (double)vector2.x, 2) + pow((double)vector1.y - (double)vector2.y, 2) + pow((double)vector1.z - (double)vector2.z, 2), 0.5);
 //}
 
-std::vector<Instance*> Application::getSelection()
-{
-	return g_selectedInstances;
-}
 void Application::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
 
 	if(_dataModel->isRunning())
 	{
+		LevelInstance* Level = _dataModel->getLevel();
+		Level->Step(sdt);
+
 		// XplicitNgine Start
 		std::vector<PartInstance *> toDelete;
 		for(size_t i = 0; i < _dataModel->getWorkspace()->partObjects.size(); i++)
@@ -335,12 +342,14 @@ void Application::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
 		{
 			PartInstance * p = toDelete.back();
 			toDelete.pop_back();
+			if(g_dataModel->getSelectionService()->isSelected(p))
+				g_dataModel->getSelectionService()->removeSelected(p);
 			p->setParent(NULL);
 			delete p;
 		}
-		for(int i = 0; i < 6; i++)
+		for(int i = 0; i < 4; i++)
 		{
-			_dataModel->getEngine()->step(sdt*2);
+			_dataModel->getEngine()->step(0.03F);
 		}
 		onLogic();
 		
@@ -560,12 +569,12 @@ void Application::onGraphics(RenderDevice* rd) {
 
 
 
-	renderDevice->setShininess(70);
+	//renderDevice->setShininess(70);
-	renderDevice->setSpecularCoefficient(Color3(0.1F, 0.1F, 0.1F));
+	//renderDevice->setSpecularCoefficient(Color3(0.1F, 0.1F, 0.1F));
 	
-	//float   lightAmbient[]  = { 0.5F, 0.6F, 0.9F, 1.0F };
+	//float   lightAmbient[]  = { 0.5F, 0.5F, 0.5F, 1.0F };
-    //float   lightDiffuse[]  = { 0.6F, 0.4F, 0.9F, 1.0F };
+    //float   lightDiffuse[]  = { 0.6F, 0.6F, 0.6F, 1.0F };
-    //float   lightSpecular[] = { 0.8F, 0.6F, 1.0F, 1.0F };
+    //float   lightSpecular[] = { 0.8F, 0.8F, 0.8F, 1.0F };
 
 	//glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, lightAmbient);
     //glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, lightDiffuse);
@@ -590,18 +599,16 @@ void Application::onGraphics(RenderDevice* rd) {
 
 
 	//Draw::box(G3D::Box(mouse.getPosition()-Vector3(2,0.5F,1),mouse.getPosition()+Vector3(2,0.5F,1)), rd, Color3::cyan(), Color4::clear());
-	if(g_selectedInstances.size() > 0)
+
+	for(size_t i = 0; i < _dataModel->getSelectionService()->getSelection().size(); i++)
 	{
-		for(size_t i = 0; i < g_selectedInstances.size(); i++)
+		if(PartInstance* part = dynamic_cast<PartInstance*>(g_dataModel->getSelectionService()->getSelection()[i]))
-		{
-			if(PartInstance* part = dynamic_cast<PartInstance*>(g_selectedInstances.at(i)))
 		{
 		Vector3 size = part->getSize();
 		Vector3 pos = part->getPosition();
 		drawOutline(Vector3(0+size.x/2, 0+size.y/2, 0+size.z/2) ,Vector3(0-size.x/2,0-size.y/2,0-size.z/2), rd, lighting, Vector3(size.x/2, size.y/2, size.z/2), Vector3(pos.x, pos.y, pos.z), part->getCFrame());
 		}		
 	}
-	}
 	
 
 	//Vector3 gamepoint = Vector3(0, 5, 0);
@@ -689,12 +696,6 @@ void Application::onKeyUp(int key)
 
 void Application::onMouseLeftPressed(HWND hwnd,int x,int y)
 {
-	//Removed set focus 
-
-
-	//std::cout << "Click: " << x << "," << y << std::endl;
-	
-	
 	bool onGUI = _dataModel->getGuiRoot()->mouseInGUI(renderDevice, x, y);
 	
 	
@@ -704,19 +705,6 @@ void Application::onMouseLeftPressed(HWND hwnd,int x,int y)
 	}
 }
 
-void Application::selectInstance(Instance* selectedInstance, PropertyWindow* propWindow)
-{
-	if(!GetHoldKeyState(VK_RCONTROL) && !GetHoldKeyState(VK_LCONTROL))
-	{
-		printf("No control key hold \n");
-		g_selectedInstances.clear();
-	}
-	else printf("Control held\n");
-	if(std::find(g_selectedInstances.begin(), g_selectedInstances.end(),selectedInstance)==g_selectedInstances.end())
-		g_selectedInstances.push_back(selectedInstance);
-	propWindow->UpdateSelected(selectedInstance);
-
-}
 G3D::RenderDevice* Application::getRenderDevice()
 {
 	return renderDevice;
@@ -724,13 +712,9 @@ G3D::RenderDevice* Application::getRenderDevice()
 
 void Application::onMouseLeftUp(G3D::RenderDevice* renderDevice, int x, int y)
 {
-	//std::cout << "Release: " << x << "," << y << std::endl;
 	_dataModel->getGuiRoot()->onMouseLeftUp(renderDevice, x, y);
 	_dragging = false;
 	tool->onButton1MouseUp(mouse);
-	//_message = "Dragging = false.";
-	//_messageTime = System::time();
-
 }
 
 void Application::onMouseRightPressed(int x,int y)
@@ -750,8 +734,6 @@ void Application::onMouseMoved(int x,int y)
 	mouse.y = y;
 	//tool->onMouseMoved(mouse);
 	mouseMoveState = true;
-	//_dataModel->mousex = x;
-	//_dataModel->mousey = y;
 
 }
 void Application::onMouseWheel(int x,int y,short delta)

src/source/CameraController.cpp

@@ -193,6 +193,8 @@ void CameraController::update(Application* app)
 	Vector3 cameraPos = g3dCamera.getCoordinateFrame().translation;
 	CoordinateFrame frame = g3dCamera.getCoordinateFrame();
 	bool moving=false;
+	if(!app->viewportHasFocus())
+		return;
 	if(GetHoldKeyState('U')) {
 		forwards = true;
 		moving=true;

src/source/DataModel/SelectionService.cpp

@@ -0,0 +1,58 @@
+#include "DataModelV2/SelectionService.h"
+
+SelectionService::SelectionService(void){
+	Instance::Instance();
+	propertyWindow = NULL;
+}
+
+SelectionService::~SelectionService(void){
+}
+
+SelectionService::SelectionService(const SelectionService &oinst){
+	Instance::Instance(oinst);
+	propertyWindow = NULL;
+}
+
+
+std::vector<Instance *> SelectionService::getSelection(){
+	return this->selection;
+}
+void SelectionService::clearSelection(){
+	this->selection.clear();
+	if(propertyWindow != NULL)
+		propertyWindow->ClearProperties();
+	printf("selectionSize: %d\n", selection.size());
+}
+bool SelectionService::isSelected(Instance * instance){
+	return std::find(selection.begin(), selection.end(), instance) != selection.end();
+}
+void SelectionService::addSelected(Instance * instance){
+	if(!isSelected(instance))
+		this->selection.push_back(instance);
+	if(propertyWindow != NULL)
+		propertyWindow->UpdateSelected(selection);
+	printf("selectionSize: %d\n", selection.size());
+}
+void SelectionService::removeSelected(Instance * instance){
+	selection.erase(std::remove(selection.begin(), selection.end(), instance), selection.end());
+	if(propertyWindow != NULL)
+		propertyWindow->UpdateSelected(selection);
+	printf("selectionSize: %d\n", selection.size());
+}
+void SelectionService::addSelected(const std::vector<Instance *> &instances){
+	for(size_t i = 0; i < instances.size(); i++)
+	{
+		if(!isSelected(instances[i]))
+			this->selection.push_back(instances[i]);
+	}
+	if(propertyWindow != NULL)
+		propertyWindow->UpdateSelected(selection);
+	printf("selectionSize: %d\n", selection.size());
+}
+void SelectionService::setPropertyWindow(PropertyWindow * propertyWindow)
+{
+	this->propertyWindow = propertyWindow;
+	if(propertyWindow != NULL)
+		propertyWindow->ClearProperties();
+	printf("selectionSize: %d\n", selection.size());
+}

src/source/DataModelV2/DataModelInstance.cpp

@@ -1,5 +1,6 @@
 #include <string>
 #include "DataModelV2/GuiRootInstance.h"
+#include "DataModelV2/ToggleImageButtonInstance.h"
 #include "DataModelV2/DataModelInstance.h"
 #include <fstream>
 #include <iostream>
@@ -19,6 +20,8 @@ DataModelInstance::DataModelInstance(void)
 	workspace = new WorkspaceInstance();
 	guiRoot = new GuiRootInstance();
 	level = new LevelInstance();
+	selectionService = new SelectionService();
+	selectionService->setPropertyWindow(g_usableApp->_propWindow);
 	//children.push_back(workspace);
 	//children.push_back(level);
 	className = "dataModel";
@@ -61,6 +64,7 @@ void DataModelInstance::toggleRun()
 	//if(!running)
 		//resetEngine();
 }
+
 bool DataModelInstance::isRunning()
 {
 	return running;
@@ -83,8 +87,17 @@ void DataModelInstance::modXMLLevel(float modY)
 
 void DataModelInstance::clearLevel()
 {
+	running = false;
+	Instance * goButton = this->getGuiRoot()->findFirstChild("go");
+	if(goButton != NULL){
+		if(ToggleImageButtonInstance* goButtonReal = dynamic_cast<ToggleImageButtonInstance*>(goButton))
+		{
+			goButtonReal->checked = false;
+		}
+	}
+	selectionService->clearSelection();
+	selectionService->addSelected(this);
 	workspace->clearChildren();
-	g_usableApp->_propWindow->UpdateSelected(this);
 }
 PartInstance* DataModelInstance::makePart()
 {
@@ -480,6 +493,8 @@ bool DataModelInstance::load(const char* filename, bool clearObjects)
 		std::string tname = hname.substr(0, hname.length() - 5);
 		name = tname;
 		resetEngine();
+		selectionService->clearSelection();
+		selectionService->addSelected(this);
 		return true;
 	}
 	else
@@ -622,25 +637,16 @@ WorkspaceInstance* DataModelInstance::getWorkspace()
 {
 	return workspace;
 }
-/*Vector2 DataModelInstance::getMousePos()
+
-{
-	return Vector2(mousex,mousey);
-}
-void DataModelInstance::setMousePos(int x,int y)
-{
-	mousex=x;
-	mousey=y;
-}
-void DataModelInstance::setMousePos(Vector2 pos)
-{
-	mousex=pos.x;
-	mousey=pos.y;
-}*/
 GuiRootInstance* DataModelInstance::getGuiRoot()
 {
 	return guiRoot;
 }
 
+SelectionService* DataModelInstance::getSelectionService()
+{
+	return selectionService;
+}
 
 LevelInstance* DataModelInstance::getLevel()
 {

src/source/DataModelV2/GuiRootInstance.cpp

@@ -507,8 +507,8 @@ void GuiRootInstance::update()
 		button4->disabled = true;
 		button5->disabled = true;
 		button6->disabled = true;
-		for(size_t i = 0; i < g_selectedInstances.size(); i++)
+		for(size_t i = 0; i < g_dataModel->getSelectionService()->getSelection().size(); i++)
-			if(g_selectedInstances.at(i)->canDelete)
+			if(g_dataModel->getSelectionService()->getSelection()[i]->canDelete)
 			{
 				button->disabled = false;
 				button2->disabled = false;

src/source/DataModelV2/LevelInstance.cpp

@@ -1,3 +1,4 @@
+#include "DataModelV2/DataModelInstance.h"
 #include "DataModelV2/LevelInstance.h"
 
 LevelInstance::LevelInstance(void)
@@ -16,6 +17,61 @@ LevelInstance::~LevelInstance(void)
 }
 
 
+static TCHAR* strActionType(int option)
+{
+	switch(option)
+	{
+		case Enum::ActionType::Nothing:
+			return "Nothing";
+		case Enum::ActionType::Pause:
+			return "Pause";
+		case Enum::ActionType::Lose:
+			return "Lose";
+		case Enum::ActionType::Draw:
+			return "Draw";
+		case Enum::ActionType::Win:
+			return "Win";
+	}
+	return "Nothing";
+}
+
+static Enum::ActionType::Value EnumActionType(TCHAR* option)
+{
+	if(strcmp("Nothing", option) == 0)
+		return Enum::ActionType::Nothing;
+	if(strcmp("Pause", option) == 0)
+		return Enum::ActionType::Pause;
+	if(strcmp("Lose", option) == 0)
+		return Enum::ActionType::Lose;
+	if(strcmp("Draw", option) == 0)
+		return Enum::ActionType::Draw;
+	return Enum::ActionType::Win;
+}
+
+static TCHAR* strAffectType(int option)
+{
+	switch(option)
+	{
+		case Enum::AffectType::NoChange:
+			return "NoChange";
+		case Enum::AffectType::Increase:
+			return "Increase";
+		case Enum::AffectType::Decrease:
+			return "Decrease";
+	}
+	return "NoChange";
+}
+
+static Enum::AffectType::Value EnumAffectType(TCHAR* option)
+{
+	if(strcmp("NoChange", option) == 0)
+		return Enum::AffectType::NoChange;
+	if(strcmp("Increase", option) == 0)
+		return Enum::AffectType::Increase;
+	return Enum::AffectType::Decrease;
+}
+
+
 char timerTxt[12];
 char scoreTxt[12];
 std::vector<PROPGRIDITEM> LevelInstance::getProperties()
@@ -29,25 +85,58 @@ std::vector<PROPGRIDITEM> LevelInstance::getProperties()
 		"The message that shows when the player wins.",
 		(LPARAM)winMessage.c_str(),
 		PIT_EDIT));
+
 	properties.push_back(createPGI("Messages",
 		"LoseMessage",
 		"The message that shows when the player loses.",
 		(LPARAM)loseMessage.c_str(),
 		PIT_EDIT));
 
+	properties.push_back(createPGI(
+		"Gameplay",
+		"HighScoreIsGood",
+		"Some temporary string here",
+		(LPARAM)HighScoreIsGood,
+		PIT_CHECK
+		));
+
+	properties.push_back(createPGI(
+		"Gameplay",
+		"RunOnOpen",
+		"Some temporary string here",
+		(LPARAM)RunOnOpen,
+		PIT_CHECK
+		));
 
 	sprintf_s(timerTxt, "%g", timer);
 	sprintf_s(scoreTxt, "%d", score);
 	properties.push_back(createPGI("Gameplay",
 		"InitialTimerValue",
-		"The ammount of time in seconds the player has to complete this level.\r\n\r\nPut 0 if time is limitless.",
+		"The amount of time in seconds the player has to complete this level.\r\n\r\nPut 0 if time is limitless.",
 		(LPARAM)timerTxt,
 		PIT_EDIT));
+
 	properties.push_back(createPGI("Gameplay",
 		"InitialScoreValue",
-		"The ammount of points the player starts with.",
+		"The amount of points the player starts with.",
 		(LPARAM)scoreTxt,
 		PIT_EDIT));
+
+		properties.push_back(createPGI("Gameplay",
+		"TimerUpAction",
+		"Some temporary string here",
+		(LPARAM)strActionType(TimerUpAction),
+		PIT_COMBO,
+		TEXT("Nothing\0Pause\0Lose\0Draw\0Win\0")
+		));
+
+		properties.push_back(createPGI("Gameplay",
+		"TimerAffectsScore",
+		"Some temporary string here",
+		(LPARAM)strAffectType(TimerAffectsScore),
+		PIT_COMBO,
+		TEXT("NoChange\0Increase\0Decrease\0")
+		));
 	return properties;
 }
 void LevelInstance::PropUpdate(LPPROPGRIDITEM &pItem)
@@ -68,6 +157,87 @@ void LevelInstance::PropUpdate(LPPROPGRIDITEM &pItem)
 	{
 		winMessage = (LPSTR)pItem->lpCurValue;
 	}
+	else if(strcmp(pItem->lpszPropName, "TimerUpAction") == 0)
+	{
+		TimerUpAction = EnumActionType((TCHAR*)pItem->lpCurValue);
+	}
+	else if(strcmp(pItem->lpszPropName, "TimerAffectsScore") == 0)
+	{
+		TimerAffectsScore = EnumAffectType((TCHAR*)pItem->lpCurValue);
+	}
+	else if(strcmp(pItem->lpszPropName, "HighScoreIsGood") == 0)
+	{
+		HighScoreIsGood = pItem->lpCurValue == TRUE;
+	}
+	else if(strcmp(pItem->lpszPropName, "RunOnOpen") == 0)
+	{
+		RunOnOpen = pItem->lpCurValue == TRUE;
+	}
 	else
 		Instance::PropUpdate(pItem);
 }
+
+void LevelInstance::winCondition()
+{
+	DataModelInstance* DataModel = (DataModelInstance*)getParent(); //If level parent gets changed to something other than Datamodel it could cause nasty data corruption bugs
+	DataModel->setMessage(winMessage);
+	DataModel->toggleRun();
+}
+
+void LevelInstance::loseCondition()
+{
+	DataModelInstance* DataModel = (DataModelInstance*)getParent();
+	DataModel->setMessage(loseMessage);
+	DataModel->toggleRun();
+}
+
+void LevelInstance::pauseCondition()
+{
+	DataModelInstance* DataModel = (DataModelInstance*)getParent();
+	DataModel->toggleRun();
+}
+
+void LevelInstance::drawCondition()
+{
+	DataModelInstance* DataModel = (DataModelInstance*)getParent();
+	DataModel->toggleRun();
+}
+
+void LevelInstance::Step(SimTime sdt)
+{
+	switch(TimerAffectsScore)
+	{
+		case Enum::AffectType::NoChange:
+			break;
+		case Enum::AffectType::Increase:
+			score += 1;
+			break;
+		case Enum::AffectType::Decrease:
+			if (score > 0)
+				score -= 1;
+			break;
+	}
+	if (timer >= 0.1f){ //Due to timing used this could cause the number go into negatives for one step
+		timer -= sdt;
+	}
+	else{
+		timer = 0.0f;
+		switch(TimerUpAction)
+		{
+			case Enum::ActionType::Nothing:
+				break;
+			case Enum::ActionType::Pause:
+				pauseCondition();
+				break;
+			case Enum::ActionType::Lose:
+				loseCondition();
+				break;
+			case Enum::ActionType::Draw:
+				drawCondition();
+				break;
+			case Enum::ActionType::Win:
+				winCondition();
+				break;
+		}
+	}
+}

src/source/DataModelV2/PartInstance.cpp

@@ -116,8 +116,11 @@ void PartInstance::setSurface(int face, Enum::SurfaceType::Value surface)
 }
 
 void PartInstance::setParent(Instance* prnt)
+{
+	if(this->physBody != NULL)
 	{
 		g_dataModel->getEngine()->deleteBody(this);
+	}
 	Instance * cparent = getParent();
 	while(cparent != NULL)
 	{
@@ -144,6 +147,7 @@ void PartInstance::setParent(Instance* prnt)
 PartInstance::PartInstance(const PartInstance &oinst)
 {
 	PVInstance::PVInstance(oinst);
+	physBody = NULL;
 	glList = glGenLists(1);
 	//name = oinst.name;
 	//className = "Part";
@@ -201,8 +205,11 @@ void PartInstance::setSize(Vector3 newSize)
 
 	size = Vector3(sizex, sizey, sizez);
 
-
+	if(this->physBody != NULL)
-
+	{
+		g_dataModel->getEngine()->deleteBody(this);
+		g_dataModel->getEngine()->createBody(this);
+	}
 }
 Vector3 PartInstance::getSize()
 {
@@ -223,6 +230,11 @@ void PartInstance::setShape(Enum::Shape::Value shape)
 		this->shape = shape;
 		this->setSize(this->getSize());
 	}
+	if(this->physBody != NULL)
+	{
+		g_dataModel->getEngine()->deleteBody(this);
+		g_dataModel->getEngine()->createBody(this);
+	}
 	changed = true;
 }
 
@@ -230,12 +242,22 @@ void PartInstance::setPosition(Vector3 pos)
 {
 	position = pos;
 	setCFrame(CoordinateFrame(cFrame.rotation, pos));
+
+	if (anchored)
+	{
+		g_dataModel->getEngine()->deleteBody(this);
+		g_dataModel->getEngine()->createBody(this);
+	}
 }
 
 void PartInstance::setAnchored(bool anchored)
 {
 	this->anchored = anchored;
+	if(this->physBody != NULL)
+	{
 		g_dataModel->getEngine()->deleteBody(this);
+		g_dataModel->getEngine()->createBody(this);
+	}
 }
 
 bool PartInstance::isAnchored()
@@ -250,15 +272,14 @@ CoordinateFrame PartInstance::getCFrame()
 }
 void PartInstance::setCFrame(CoordinateFrame coordinateFrame)
 {
-	g_dataModel->getEngine()->updateBody(this, &coordinateFrame);
 	setCFrameNoSync(coordinateFrame);
+		g_dataModel->getEngine()->updateBody(this);
 }
 
 void PartInstance::setCFrameNoSync(CoordinateFrame coordinateFrame)
 {
 	cFrame = coordinateFrame;
 	position = coordinateFrame.translation;
-	changed = true;
 }
 
 bool PartInstance::collides(PartInstance * part)

src/source/Globals.cpp

@@ -1,16 +1,11 @@
 #include "Globals.h"
 #include "Application.h"
 
-int const Globals::gen = 0;
-int const Globals::major = 0;
-int const Globals::minor = 105;
-int const Globals::patch = 0;
 int Globals::surfaceId = 2;
 //bool Globals::showMouse = true;
 bool Globals::useMousePoint = false;
 std::vector<Instance*> postRenderStack = std::vector<Instance*>();
 
-std::vector<Instance*> g_selectedInstances = std::vector<Instance*>();
 DataModelInstance* g_dataModel = NULL;
 XplicitNgine* g_xplicitNgine = NULL;
 

src/source/IEBrowser.cpp

@@ -2,7 +2,6 @@
 	#define WIN32_LEAN_AND_MEAN
 #endif
 
-
 #include <windows.h>
 #include <Commdlg.h>
 #include "IEBrowser.h"
@@ -11,6 +10,9 @@
 #include "ax.h"
 #include "Tool/SurfaceTool.h"
 #include "Application.h"
+#include "Enum.h"
+#include "ToolEnum.h"
+#include "VS2005CompatShim.h"
 
 HRESULT IEBrowser::doExternal(std::wstring funcName,
   DISPID dispIdMember,
@@ -30,9 +32,24 @@ HRESULT IEBrowser::doExternal(std::wstring funcName,
 	}
 	else if (funcName==L"ToggleHopperBin")
 	{
-		pVarResult->vt = VT_INT;
+		MessageBox(NULL, "BOOP", "Boopity boop",MB_OK);
-		pVarResult->intVal = 5;
+
-		//MessageBox(NULL, "BOOP", "Boopity boop",MB_OK);
+		/*To-do Make enums in ToolEnum work with this properly, 
+		commented code is not fully tested.*/
+		/*MessageBox(NULL,
+				   std::to_string(pDispParams->rgvarg->intVal).c_str(),
+				   "Is it working?", 
+				   MB_OK);
+		Enum::Hopper::Value cont = (Enum::Hopper::Value)pDispParams->rgvarg->intVal;
+
+		switch (cont) 
+		{
+		case GameTool
+		case Grab
+			
+			break;
+		}*/
+		return S_OK;
 	}
 	else if (funcName==L"SetController")
 	{
@@ -43,9 +60,9 @@ HRESULT IEBrowser::doExternal(std::wstring funcName,
 		if(pDispParams->rgvarg->intVal < 0 || pDispParams->rgvarg->intVal > 7)
 			return S_OK;
 		Enum::Controller::Value cont = (Enum::Controller::Value)pDispParams->rgvarg->intVal;
-		for(size_t i = 0; i < g_selectedInstances.size(); i++)
+		for(size_t i = 0; i < g_dataModel->getSelectionService()->getSelection().size(); i++)
 		{
-			if(PVInstance* part = dynamic_cast<PVInstance*>(g_selectedInstances.at(i)))
+			if(PVInstance* part = dynamic_cast<PVInstance*>(g_dataModel->getSelectionService()->getSelection()[i]))
 			{
 				ding = true;
 				part->controller = cont;

src/source/Listener/CameraButtonListener.cpp

@@ -7,8 +7,8 @@ void CameraButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 {
 	AudioPlayer::playSound(cameraSound);
 	CoordinateFrame frame = g_usableApp->cameraController.getCamera()->getCoordinateFrame();
-	if(button->name == "CenterCam" && g_selectedInstances.size() > 0)
+	if(button->name == "CenterCam" && g_dataModel->getSelectionService()->getSelection().size() > 0)
-		g_usableApp->cameraController.centerCamera(g_selectedInstances.at(0));
+		g_usableApp->cameraController.centerCamera(g_dataModel->getSelectionService()->getSelection()[0]);
 	else if(button->name == "ZoomIn")
 		g_usableApp->cameraController.Zoom(1);
 	else if(button->name == "ZoomOut")

src/source/Listener/GUDButtonListener.cpp

@@ -2,13 +2,14 @@
 #include "Application.h"
 #include "Globals.h"
 #include "AudioPlayer.h"
+#include "DataModelV2/SelectionService.h"
 #include "Listener/GUDButtonListener.h"
 
 void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 {
 	bool cont = false;
-	for(size_t i = 0; i < g_selectedInstances.size(); i++)
+	for(size_t i = 0; i < g_dataModel->getSelectionService()->getSelection().size(); i++)
-		if(g_selectedInstances.at(i)->canDelete)
+		if(g_dataModel->getSelectionService()->getSelection()[i]->canDelete)
 		{
 			cont = true;	
 			break;
@@ -19,53 +20,46 @@ void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 		if(button->name == "Duplicate")
 		{
 			std::vector<Instance*> newinst;
-			for(size_t i = 0; i < g_selectedInstances.size(); i++)
+			for(size_t i = 0; i < g_dataModel->getSelectionService()->getSelection().size(); i++)
 			{
-				if(g_selectedInstances.at(i)->canDelete)
+				if(g_dataModel->getSelectionService()->getSelection()[i]->canDelete)
 				{
-				Instance* tempinst = g_selectedInstances.at(i);
+				Instance* tempinst = g_dataModel->getSelectionService()->getSelection()[i];
 				
-				Instance* clonedInstance = g_selectedInstances.at(i)->clone();
+				Instance* clonedInstance = g_dataModel->getSelectionService()->getSelection()[i]->clone();
 
 				newinst.push_back(tempinst);
 				}
-				/*tempinst->setPosition(Vector3(tempPos.x, tempPos.y + tempSize.y, tempPos.z));
-				g_usableApp->cameraController.centerCamera(g_selectedInstances.at(0));*/
 			}
-			g_selectedInstances = newinst;
+			g_dataModel->getSelectionService()->clearSelection();
-			if(g_selectedInstances.size() > 0)
+			g_dataModel->getSelectionService()->addSelected(newinst);
-				g_usableApp->_propWindow->UpdateSelected(newinst.at(0));
 		}
 		else if(button->name == "Group")
 		{
 			GroupInstance * inst = new GroupInstance();
 			inst->setParent(g_dataModel->getWorkspace());
-			for(size_t i = 0; i < g_selectedInstances.size(); i++)
+			for(size_t i = 0; i < g_dataModel->getSelectionService()->getSelection().size(); i++)
 			{
-				if(g_selectedInstances.at(i)->canDelete)
+				if(g_dataModel->getSelectionService()->getSelection()[i]->canDelete)
 				{
-					g_selectedInstances.at(i)->setParent(inst);
+					g_dataModel->getSelectionService()->getSelection()[i]->setParent(inst);
-					if(PartInstance* part = dynamic_cast<PartInstance*>(g_selectedInstances.at(i)))
+					if(PartInstance* part = dynamic_cast<PartInstance*>(g_dataModel->getSelectionService()->getSelection()[i]))
 					{
 						inst->primaryPart = part;
 					}
 				}
-				/*tempinst->setPosition(Vector3(tempPos.x, tempPos.y + tempSize.y, tempPos.z));
-				g_usableApp->cameraController.centerCamera(g_selectedInstances.at(0));*/
 			}
-			g_selectedInstances.clear();
+			g_dataModel->getSelectionService()->clearSelection();
-			g_selectedInstances.push_back(inst);
+			g_dataModel->getSelectionService()->addSelected(inst);
-			if(g_selectedInstances.size() > 0)
-				g_usableApp->_propWindow->UpdateSelected(g_selectedInstances.at(0));
 		}
 		else if(button->name == "UnGroup")
 		{
 			std::vector<Instance*> newinst;
-			for(size_t i = 0; i < g_selectedInstances.size(); i++)
+			for(size_t i = 0; i < g_dataModel->getSelectionService()->getSelection().size(); i++)
 			{
-				if(g_selectedInstances.at(i)->canDelete)
+				if(g_dataModel->getSelectionService()->getSelection()[i]->canDelete)
 				{
-					if(GroupInstance* model = dynamic_cast<GroupInstance*>(g_selectedInstances.at(i)))
+					if(GroupInstance* model = dynamic_cast<GroupInstance*>(g_dataModel->getSelectionService()->getSelection()[i]))
 					{
 						newinst = model->unGroup();
 						model->setParent(NULL);
@@ -73,13 +67,9 @@ void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 						model = NULL;
 					}
 				}
-				/*tempinst->setPosition(Vector3(tempPos.x, tempPos.y + tempSize.y, tempPos.z));
-				g_usableApp->cameraController.centerCamera(g_selectedInstances.at(0));*/
 			}
-			g_selectedInstances.clear();
+			g_dataModel->getSelectionService()->clearSelection();
-			g_selectedInstances = newinst;
+			g_dataModel->getSelectionService()->addSelected(newinst);
-			if(g_selectedInstances.size() > 0)
-				g_usableApp->_propWindow->UpdateSelected(newinst.at(0));
 		}
 	}
 }

src/source/Listener/RotateButtonListener.cpp

@@ -5,9 +5,9 @@
 
 void RotateButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 {
-	if(g_selectedInstances.size() > 0)
+	if(g_dataModel->getSelectionService()->getSelection().size() > 0)
 	{
-		Instance* selectedInstance = g_selectedInstances.at(0);
+		Instance* selectedInstance = g_dataModel->getSelectionService()->getSelection()[0];
 		AudioPlayer::playSound(clickSound);
 		if(PartInstance* part = dynamic_cast<PartInstance*>(selectedInstance))
 		{

src/source/Mouse.cpp

@@ -112,31 +112,3 @@ void Mouse::setMouseDown(bool bval)
 {
 	mouseDown = bval;
 }
-
-
-
-				//bool found = false;
-				/*for(size_t i = 0; i < g_selectedInstances.size(); i++)
-				{
-					if(g_selectedInstances.at(i) == test)
-					{
-						found = true;
-						//ShowWindow(_propWindow->_hwndProp, SW_SHOW);
-						//SetActiveWindow(_propWindow->_hwndProp);
-						//SetForegroundWindow(_propWindow->_hwndProp);
-						break;
-					}
-				}
-				if(!found)
-				{
-					selectedInstance = test;
-					//if(!GetHoldKeyState(VK_RCONTROL) && !GetHoldKeyState(VK_LCONTROL))
-						//g_selectedInstances.clear();
-					//if(std::find(g_selectedInstances.begin(), g_selectedInstances.end(),test)==g_selectedInstances.end())
-						//g_selectedInstances.push_back(test);
-				}
-				//selectInstance(test, _propWindow);
-				//_message = "Dragging = true.";
-				//_messageTime = System::time();
-				//_dragging = true;*/
-

src/source/PropertyWindow.cpp

@@ -3,7 +3,6 @@
 #include "WindowFunctions.h"
 #include "resource.h"
 #include "PropertyWindow.h"
-#include "Globals.h"
 #include "strsafe.h"
 #include "Application.h"
 
@@ -172,8 +171,8 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 					int ItemIndex = SendMessage((HWND) lParam, (UINT) CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0);
 					CHAR  ListItem[256];
 					SendMessage((HWND) lParam, (UINT) CB_GETLBTEXT, (WPARAM) ItemIndex, (LPARAM) ListItem); 
-					propWind->ClearProperties();
+					g_dataModel->getSelectionService()->clearSelection();
-					g_usableApp->selectInstance(children.at(ItemIndex),propWind);
+					g_dataModel->getSelectionService()->addSelected(children.at(ItemIndex));
 				}
 			}
 		break;
@@ -203,13 +202,18 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	return 0; 
 }
 
-void PropertyWindow::refreshExplorer(Instance* selectedInstance)
+void PropertyWindow::clearExplorer()
 {
+	SendMessage(_explorerComboBox,CB_RESETCONTENT,0,0); 
+	SendMessage(_explorerComboBox,CB_SETCURSEL,0,(LPARAM)0);
+}
+
+void PropertyWindow::refreshExplorer(std::vector<Instance*> selectedInstances)
+{
+	Instance * instance = selectedInstances[0];
 	SendMessage(_explorerComboBox,CB_RESETCONTENT,0,0); 
 	parent = NULL;
 	children.clear();
-	//g_selectedInstances.clear();
-	//for (unsigned int i=0;i<g_selectedInstances.size();i++) {
 	children.push_back(selectedInstance);
 	SendMessage(_explorerComboBox, CB_ADDSTRING, 0, (LPARAM)selectedInstance->name.c_str()); 
 	if(selectedInstance->getParent() != NULL)
@@ -221,7 +225,6 @@ void PropertyWindow::refreshExplorer(Instance* selectedInstance)
 		parent = selectedInstance->getParent();
 		children.push_back(selectedInstance->getParent());
 	}
-	//children = g_selectedInstances[i]->getChildren();
 
 	std::vector<Instance*> selectedChildren = selectedInstance->getChildren();
 	for(size_t z = 0; z < selectedChildren.size(); z++)
@@ -338,11 +341,17 @@ void PropertyWindow::_resize()
 	SetWindowPos(_explorerComboBox, NULL, 0, 0, rect.right, 400, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
 }
 
-void PropertyWindow::UpdateSelected(Instance * instance)
+void PropertyWindow::UpdateSelected(std::vector<Instance *> instances)
 {
+	if(instances.size() <= 0)
+	{
+		ClearProperties();
+		return;
+	}
+	Instance * instance = instances[0];
 	PropGrid_ResetContent(_propGrid);
 	prop = instance->getProperties();
-	if (selectedInstance != instance)
+	//if (selectedInstance != instance)
 	{
 		selectedInstance = instance;
 		for(size_t i = 0; i < prop.size(); i++)
@@ -356,12 +365,13 @@ void PropertyWindow::UpdateSelected(Instance * instance)
 		PropGrid_ExpandAllCatalogs(_propGrid);
 		//SetWindowLongPtr(_propGrid,GWL_USERDATA,(LONG)this);
 
-		refreshExplorer(instance);
+		refreshExplorer(instances);
 		_resize();
 	}
 }
 
 void PropertyWindow::ClearProperties()
 {
+	clearExplorer();
 	PropGrid_ResetContent(_propGrid);
 }

src/source/Tool/ArrowTool.cpp

@@ -1,5 +1,6 @@
 #include "Tool/ArrowTool.h"
 #include "Application.h"
+#include "DataModelV2/SelectionService.h"
 
 ArrowTool::ArrowTool(void)
 {
@@ -21,13 +22,18 @@ void ArrowTool::onButton1MouseDown(Mouse mouse)
 	mouseDownStarty = mouse.y;
 	mouseDown = true;
 	if(!lctrlDown && !rctrlDown)
-		g_selectedInstances.clear();
+		g_dataModel->getSelectionService()->clearSelection();
 	PartInstance * target = mouse.getTarget();
-	if(target != NULL && std::find(g_selectedInstances.begin(), g_selectedInstances.end(), target) == g_selectedInstances.end())
+	if(target != NULL)
-		g_selectedInstances.push_back(target);
+	{
-	if(g_selectedInstances.size() == 0)
+		Vector3 mousePos = mouse.getPosition(g_dataModel->getSelectionService()->getSelection());
-		g_selectedInstances.push_back(g_dataModel);
+		Vector3 targetPos = target->getPosition();
-	g_usableApp->_propWindow->UpdateSelected(g_selectedInstances[0]);
+		
+		g_dataModel->getSelectionService()->addSelected(target);
+		draggingPartOffset = targetPos-mousePos;
+	}
+	if(g_dataModel->getSelectionService()->getSelection().size() == 0)
+		g_dataModel->getSelectionService()->addSelected(g_dataModel);
 }
 void ArrowTool::onButton1MouseUp(Mouse mouse)
 {
@@ -47,11 +53,44 @@ void ArrowTool::onMouseMoved(Mouse mouse)
 			}
 			else return;
 		}
-		for(size_t i = 0; i < g_selectedInstances.size(); i++) //This will later decide primary and move all parts according to primary
+		for(size_t i = 0; i < g_dataModel->getSelectionService()->getSelection().size(); i++) //This will later decide primary and move all parts according to primary
 		{
-			if(PartInstance * part = dynamic_cast<PartInstance *>(g_selectedInstances[i]))
+			if(PartInstance * part = dynamic_cast<PartInstance *>(g_dataModel->getSelectionService()->getSelection()[i]))
 			{
-				part->setPosition(mouse.getPosition(g_selectedInstances));
+				Vector3 mousePos = mouse.getPosition(g_dataModel->getSelectionService()->getSelection());
+				Vector3 vec = mousePos + draggingPartOffset;
+
+				vec.x = (ceil(vec.x / 1) * 1);
+				vec.y = (ceil(vec.y / 1) * 1);
+				vec.z = (ceil(vec.z / 1) * 1);
+
+				if ( ((int)part->getSize().x)%2 == 1 )
+					vec.x += 0.5;
+
+				vec.y = mousePos.y + part->getSize().y/2 - 0.5;
+
+				if ( ((int)part->getSize().z)%2 == 1 )
+					vec.z += 0.5;
+
+				Matrix3 rot = part->getCFrame().rotation;
+				Vector3 rotEulerAngles;
+
+				rot.toEulerAnglesXYZ(rotEulerAngles.x, rotEulerAngles.y, rotEulerAngles.z);
+
+				rotEulerAngles = Vector3(
+					rotEulerAngles.x * 180 / M_PI,
+					rotEulerAngles.y * 180 / M_PI,
+					rotEulerAngles.z * 180 / M_PI
+				);
+
+				roundDeg(rotEulerAngles.x);
+				roundDeg(rotEulerAngles.y);
+				roundDeg(rotEulerAngles.z);
+
+				rot = rot.fromEulerAnglesXYZ( rotEulerAngles.x * (M_PI / 180), rotEulerAngles.y * (M_PI / 180), rotEulerAngles.z * (M_PI / 180) );
+
+				part->setPosition(vec);
+				part->setCFrame(CoordinateFrame(rot, vec));
 			}
 		}
 		return;
@@ -76,3 +115,19 @@ void ArrowTool::onKeyUp(int key)
 	if(key == VK_CONTROL)
 		lctrlDown = false;
 }
+
+void ArrowTool::roundDeg(float &degree)
+{
+	if ( ( degree < 0 && degree > -45 ) || ( degree > 0 && degree < 45 ) )
+	{
+		degree = 0;
+	}
+	else if ( ( degree < 0 && degree > -90 ) || ( degree > 45 && degree < 90 ) )
+	{
+		degree = 90;
+	}
+	else if ( ( degree < 0 && degree > -180 ) || ( degree > 90 && degree < 180 ) )
+	{
+		degree = 180;
+	}
+}

src/source/XplicitNgine/XplicitNgine.cpp

@@ -1,21 +1,26 @@
 #include "XplicitNgine/XplicitNgine.h"
 #include "Globals.h"
 
-#define SIDE (0.5f)
+//#define SIDE (0.5f)
-#define MASS (1.0)
+//#define MASS (1.0)
 
 // constraints
-#define MAX_BODIES 65535
+//#define MAX_BODIES 65535
-#define OBJ_DENSITY (5.0)
+//#define OBJ_DENSITY (5.0)
-#define MAX_CONTACT_PER_BODY 4
+//#define MAX_CONTACT_PER_BODY 4
 
 XplicitNgine::XplicitNgine() 
 {
+	
 	physWorld = dWorldCreate();
 	physSpace = dHashSpaceCreate(0);
 	contactgroup = dJointGroupCreate(0);
 
-	dWorldSetGravity(physWorld, 0, -0.5, 0);
+	dWorldSetGravity(physWorld, 0, -9.8F, 0);
+	dWorldSetAutoDisableFlag(physWorld, 1);
+	dWorldSetAutoDisableLinearThreshold(physWorld, 0.5F);
+	dWorldSetAutoDisableAngularThreshold(physWorld, 0.5F);
+	dWorldSetAutoDisableSteps(physWorld, 20);
 
 	this->name = "PhysicsService";
 	//dGeomID ground_geom = dCreatePlane(physSpace, 0, 1, 0, 0);
@@ -35,6 +40,7 @@ void collisionCallback(void *data, dGeomID o1, dGeomID o2)
 	
 	dBodyID b1 = dGeomGetBody(o1);
 	dBodyID b2 = dGeomGetBody(o2);
+
 	if (b1 && b2 && dAreConnected(b1, b2))
 		return;
 	
@@ -48,7 +54,7 @@ void collisionCallback(void *data, dGeomID o1, dGeomID o2)
 			// Define contact surface properties
 
 			contact[i].surface.bounce = 0.5; //Elasticity
-			contact[i].surface.mu = 0.3F; //Friction
+			contact[i].surface.mu = 0.4F; //Friction
 			contact[i].surface.slip1 = 0.0;
 			contact[i].surface.slip2 = 0.0;
 			contact[i].surface.soft_erp = 0.8F;
@@ -70,8 +76,36 @@ void XplicitNgine::deleteBody(PartInstance* partInstance)
 {
 	if(partInstance->physBody != NULL)
 	{
-		while(dBodyGetNumJoints(partInstance->physBody) > 0) {
+		dBodyEnable(partInstance->physBody);
-			dJointDestroy(dBodyGetJoint(partInstance->physBody, 0));
+		dGeomEnable(partInstance->physGeom[0]);
+		if(partInstance->isAnchored())
+		{
+			dGeomSetBody(partInstance->physGeom[0], partInstance->physBody);
+			dGeomEnable(partInstance->physGeom[0]);
+			updateBody(partInstance);
+			step(0.03F);
+		}
+
+		for(int i = 0; i < dBodyGetNumJoints(partInstance->physBody); i++) {
+			dBodyID b1 = dJointGetBody(dBodyGetJoint(partInstance->physBody, i), 0);
+			dBodyID b2 = dJointGetBody(dBodyGetJoint(partInstance->physBody, i), 1);
+			
+			if(b1 != NULL)
+			{
+				dBodyEnable(b1);
+				PartInstance * part = (PartInstance *)dBodyGetData(b1);
+				if(part != NULL)
+					dGeomEnable(part->physGeom[0]);
+			}
+
+			if(b2 != NULL)
+			{
+				dBodyEnable(b2);
+				PartInstance * part = (PartInstance *)dBodyGetData(b2);
+				if(part != NULL)
+					dGeomEnable(part->physGeom[0]);
+			}
+			dJointDestroy(dBodyGetJoint(partInstance->physBody, i));
 		}
 		dBodyDestroy(partInstance->physBody);
 		dGeomDestroy(partInstance->physGeom[0]);
@@ -86,16 +120,22 @@ void XplicitNgine::createBody(PartInstance* partInstance)
 
 	if(partInstance->physBody == NULL) 
 	{
+		
+		Vector3 partSize = partInstance->getSize();
+		Vector3 partPosition = partInstance->getPosition();
+		Vector3 velocity = partInstance->getVelocity();
+		Vector3 rotVelocity = partInstance->getRotVelocity();
 		// init body
 		partInstance->physBody = dBodyCreate(physWorld);
+		dBodySetData(partInstance->physBody, partInstance);
 		
 		// Create geom
 		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 +148,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(sqrt(partSize.x*2), sqrt(partSize.y*2), sqrt(partSize.z*2), 0.7F);
 		dBodySetMass(partInstance->physBody, &mass);
 
 		// Debug output
@@ -121,21 +161,23 @@ 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);
+
+		dBodySetLinearVel(partInstance->physBody, velocity.x, velocity.y, velocity.z);
+		dBodySetAngularVel(partInstance->physBody, rotVelocity.x, rotVelocity.y, rotVelocity.z);
 
 		Matrix3 g3dRot = partInstance->getCFrame().rotation;
 		float rotation [12] = {	g3dRot[0][0], g3dRot[0][1], g3dRot[0][2], 0,
 								g3dRot[1][0], g3dRot[1][1], g3dRot[1][2], 0,
 								g3dRot[2][0], g3dRot[2][1], g3dRot[2][2], 0};
-
 		dGeomSetRotation(partInstance->physGeom[0], rotation);
 		dBodySetRotation(partInstance->physBody, rotation);
 
@@ -147,6 +189,12 @@ void XplicitNgine::createBody(PartInstance* partInstance)
 	} else {
 		if(!partInstance->isAnchored())
 		{
+			const dReal* velocity = dBodyGetLinearVel(partInstance->physBody);
+			const dReal* rotVelocity = dBodyGetAngularVel(partInstance->physBody);
+			
+			partInstance->setVelocity(Vector3(velocity[0],velocity[1],velocity[2]));
+			partInstance->setRotVelocity(Vector3(rotVelocity[0],rotVelocity[1],rotVelocity[2]));
+
 			const dReal* physPosition = dBodyGetPosition(partInstance->physBody);
 			
 			// TODO: Rotation code
@@ -167,24 +215,28 @@ void XplicitNgine::createBody(PartInstance* partInstance)
 
 void XplicitNgine::step(float stepSize)
 {	
+	dJointGroupEmpty(contactgroup);
 	dSpaceCollide (physSpace,0,&collisionCallback);
 	dWorldQuickStep(physWorld, stepSize);
-	dJointGroupEmpty(contactgroup);
+	//dWorldStepFast1(physWorld, stepSize*2, 100);
+	//dWorldStep(physWorld, stepSize);
 }
 
-void XplicitNgine::updateBody(PartInstance *partInstance, CoordinateFrame * cFrame)
+void XplicitNgine::updateBody(PartInstance *partInstance)
 {
 	if(partInstance->physBody != NULL)
 	{
-		Vector3 position = cFrame->translation;
+		Vector3 position = partInstance->getCFrame().translation;
 
 		dBodySetPosition(partInstance->physBody, 
 			position[0],
 			position[1],
 			position[2]
 		);
+		dBodyEnable(partInstance->physBody);
+		dGeomEnable(partInstance->physGeom[0]);
 
-		Matrix3 g3dRot = cFrame->rotation;
+		Matrix3 g3dRot = partInstance->getCFrame().rotation;
 		float rotation [12] = {	g3dRot[0][0], g3dRot[0][1], g3dRot[0][2], 0,
 								g3dRot[1][0], g3dRot[1][1], g3dRot[1][2], 0,
 								g3dRot[2][0], g3dRot[2][1], g3dRot[2][2], 0};

src/source/main.cpp

@@ -148,7 +148,9 @@ LRESULT CALLBACK G3DProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 
 
 int main(int argc, char** argv) {
+#ifndef _DEBUG
 	try{
+#endif
 		hresult = OleInitialize(NULL);
 
 /*		IInternetSecurityManager *pSecurityMgr;
@@ -214,10 +216,12 @@ int main(int argc, char** argv) {
 		Globals::mainHwnd = hwndMain;
 		Application app = Application(hwndMain);
 		app.run();	
+#ifndef _DEBUG
 	}
 	catch(...)
 	{
 		OnError(-1);
 	}
+#endif
     return 0;
 }