Removed a whole bunch of obsolete files.

2023-11-04 00:56:11 +00:00
46 changed files with 53 additions and 76 deletions
--- a/VS2003.vcproj
+++ b/VS2003.vcproj
@@ -369,7 +369,7 @@
 					RelativePath=".\src\source\DataModelV2\SoundService.cpp">
 				</File>
 				<File
-					RelativePath=".\ThumbnailGeneratorInstance.cpp">
+					RelativePath=".\src\source\DataModelV2\ThumbnailGeneratorInstance.cpp">
 				</File>
 				<File
 					RelativePath=".\src\source\DataModelV2\WorkspaceInstance.cpp">
--- a/Blocks3D.vcproj
+++ b/Blocks3D.vcproj
@@ -523,7 +523,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\ThumbnailGeneratorInstance.cpp"
+					RelativePath=".\src\source\DataModelV2\ThumbnailGeneratorInstance.cpp"
 					>
 				</File>
 				<File
--- a/Documentation/index.html
+++ b/Documentation/index.html
@@ -1,13 +0,0 @@
-<html>
-  <head>
-    <title> RBX05R Documentation </title>
-    <meta charset="utf-8">
-  </head>
-  <body>
-    <div class="content" style="text-align:center;">
-      <h1> ROBLOX 2005 Recreation documentation </h1>
-      <br>
-      <h4> Current for: r360 </h4> 
-    </div>
-  </body>
-  </html>
--- a/Installer/setup.png
+++ b/Installer/setup.png
--- a/Parts.png
+++ b/Parts.png
--- a/PartsOld.bmp
+++ b/PartsOld.bmp
--- a/README.md
+++ b/README.md
@@ -10,4 +10,4 @@ Equivalent to known features of 05 as it stood in October 2005 with the 'Morgan

 ## Credits
 - Morgan McGuire, creator of G3D - his old pre-2006 website for the only existing colour pictures of 2005 era roblox on the internet, as well as a couple of helpful emails. He assisted roblox development in the 2004-2006 timeframe.
- David Baszucki and Erik Cassel - for creating roblox
+- David Baszucki and Erik Cassel (1967-2013, RIP) - for creating roblox
--- a/oldcontent/cursor.png
+++ b/oldcontent/cursor.png
--- a/oldcontent/cursor2.png
+++ b/oldcontent/cursor2.png
--- a/oldcontent/font/arial-small.fnt
+++ b/oldcontent/font/arial-small.fnt
--- a/oldcontent/font/arial.fnt
+++ b/oldcontent/font/arial.fnt
--- a/oldcontent/font/arialblack-small.fnt
+++ b/oldcontent/font/arialblack-small.fnt
--- a/oldcontent/font/arialblack.fnt
+++ b/oldcontent/font/arialblack.fnt
--- a/oldcontent/font/arialround.fnt
+++ b/oldcontent/font/arialround.fnt
--- a/oldcontent/font/ariaround-small.fnt
+++ b/oldcontent/font/ariaround-small.fnt
--- a/oldcontent/font/dominant-small.fnt
+++ b/oldcontent/font/dominant-small.fnt
--- a/oldcontent/font/lighttrek-small.fnt
+++ b/oldcontent/font/lighttrek-small.fnt
--- a/oldcontent/font/lighttrek.fnt
+++ b/oldcontent/font/lighttrek.fnt
--- a/oldcontent/images/ArrowCursor.png
+++ b/oldcontent/images/ArrowCursor.png
--- a/oldcontent/images/ArrowFarCursor.png
+++ b/oldcontent/images/ArrowFarCursor.png
--- a/oldcontent/images/DragCursor.png
+++ b/oldcontent/images/DragCursor.png
--- a/oldcontent/images/DropperCursor.png
+++ b/oldcontent/images/DropperCursor.png
--- a/oldcontent/images/FillCursor.png
+++ b/oldcontent/images/FillCursor.png
--- a/oldcontent/images/FlagCursor.png
+++ b/oldcontent/images/FlagCursor.png
--- a/oldcontent/images/FlatCursor.png
+++ b/oldcontent/images/FlatCursor.png
--- a/oldcontent/images/GlueCursor.png
+++ b/oldcontent/images/GlueCursor.png
--- a/oldcontent/images/GrabCursor.png
+++ b/oldcontent/images/GrabCursor.png
--- a/oldcontent/images/GrabRotateCursor.png
+++ b/oldcontent/images/GrabRotateCursor.png
--- a/oldcontent/images/HammerCursor.png
+++ b/oldcontent/images/HammerCursor.png
--- a/oldcontent/images/HammerDownCursor.png
+++ b/oldcontent/images/HammerDownCursor.png
--- a/oldcontent/images/HammerOverCursor.png
+++ b/oldcontent/images/HammerOverCursor.png
--- a/oldcontent/images/HingeCursor.png
+++ b/oldcontent/images/HingeCursor.png
--- a/oldcontent/images/LockCursor.png
+++ b/oldcontent/images/LockCursor.png
--- a/oldcontent/images/MotorCursor.png
+++ b/oldcontent/images/MotorCursor.png
--- a/oldcontent/images/ResizeCursor.png
+++ b/oldcontent/images/ResizeCursor.png
--- a/oldcontent/images/SpawnCursor.png
+++ b/oldcontent/images/SpawnCursor.png
--- a/oldcontent/images/UnAnchorCursor.png
+++ b/oldcontent/images/UnAnchorCursor.png
--- a/oldcontent/images/UnlockCursor.png
+++ b/oldcontent/images/UnlockCursor.png
--- a/oldcontent/images/WeldCursor.png
+++ b/oldcontent/images/WeldCursor.png
--- a/oldcontent/images/surface.png
+++ b/oldcontent/images/surface.png
--- a/oldcontent/images/surfacebr.png
+++ b/oldcontent/images/surfacebr.png
--- a/roblox_RN1_icon.ico
+++ b/roblox_RN1_icon.ico
--- a/src/include/Tool/DraggerTool.h
+++ b/src/include/Tool/DraggerTool.h
@@ -20,6 +20,6 @@ private:
 	bool hasHandles;
 	int handleGrabbed;
 	Vector3 center;
-	Vector3 centerOffset;
+	Vector3 CenterOffset;
 	Sphere handles[6];
 };
--- a/src/source/DataModelV2/GuiRootInstance.cpp
+++ b/src/source/DataModelV2/GuiRootInstance.cpp
@@ -19,16 +19,6 @@
 #include "Listener/DeleteListener.h"
 #include "Listener/ToolbarListener.h"

-#ifndef _DEBUG
-	#if _MSC_VER== 1310
-		#define VS03_WORKAROUND &
-	#else
-		#define VS03_WORKAROUND
-	#endif
-#else
-	#define VS03_WORKAROUND
-#endif
-
 MenuButtonListener menuListener = MenuButtonListener();
 ToolbarListener toolbar = ToolbarListener();
 GUDButtonListener gud = GUDButtonListener();
@@ -290,13 +280,13 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	button->setButtonListener(menuListener);

 	ImageButtonInstance* instance = new ToggleImageButtonInstance(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/Run.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/Run_ovr.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/Run_dn.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/Run.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/Run_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/Run_dn.png")),
 		NULL,		
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/Stop.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/Stop_ovr.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/Stop_dn.png"))
+		Texture::fromFile(&GetFileInPath("/content/images/Stop.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/Stop_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/Stop_dn.png"))
 		);
 	instance->setButtonListener(menuListener);
 	instance->name = "go";
@@ -306,17 +296,17 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)


 	instance = makeImageButton(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/ArrowTool.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/ArrowTool_ovr.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/ArrowTool_dn.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/ArrowTool_ds.png")));
+		Texture::fromFile(&GetFileInPath("/content/images/ArrowTool.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/ArrowTool_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/ArrowTool_dn.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/ArrowTool_ds.png")));
 	instance->size = Vector2(50,50);
 	instance->position = Vector2(15, 90);
 	instance->setParent(this);
 	instance->name = "Cursor";
 	instance->setButtonListener(msl);

-	instance = makeImageButton(Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/ScaleTool.png")),Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/ScaleTool_ovr.png")),Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/ScaleTool_dn.png")),Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/ScaleTool_ds.png")));
+	instance = makeImageButton(Texture::fromFile(&GetFileInPath("/content/images/ScaleTool.png")),Texture::fromFile(&GetFileInPath("/content/images/ScaleTool_ovr.png")),Texture::fromFile(&GetFileInPath("/content/images/ScaleTool_dn.png")),Texture::fromFile(&GetFileInPath("/content/images/ScaleTool_ds.png")));
 	instance->size = Vector2(40,40);
 	instance->position = Vector2(0, 140);
 	instance->setParent(this);
@@ -325,10 +315,10 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	

 	instance = makeImageButton(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/MoveTool.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/MoveTool_ovr.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/MoveTool_dn.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/MoveTool_ds.png")));
+		Texture::fromFile(&GetFileInPath("/content/images/MoveTool.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/MoveTool_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/MoveTool_dn.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/MoveTool_ds.png")));
 	instance->size = Vector2(40,40);
 	instance->position = Vector2(40, 140);
 	instance->setParent(this);
@@ -336,10 +326,10 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->setButtonListener(msl);

 	instance = makeImageButton(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/SelectionRotate.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/SelectionRotate_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/SelectionRotate.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/SelectionRotate_ovr.png")),
 		NULL,
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/SelectionRotate_ds.png")));
+		Texture::fromFile(&GetFileInPath("/content/images/SelectionRotate_ds.png")));
 	instance->size = Vector2(30,30);
 	instance->position = Vector2(10, 175);
 	instance->setParent(this);
@@ -347,10 +337,10 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->setButtonListener(rbl);

 	instance = makeImageButton(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/SelectionTilt.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/SelectionTilt_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/SelectionTilt.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/SelectionTilt_ovr.png")),
 		NULL,
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/SelectionTilt_ds.png")));
+		Texture::fromFile(&GetFileInPath("/content/images/SelectionTilt_ds.png")));
 	instance->size = Vector2(30,30);
 	instance->position = Vector2(40, 175);
 	instance->setParent(this);
@@ -359,10 +349,10 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)


 	instance = makeImageButton(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/Delete.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/Delete_ovr.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/Delete_dn.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/Delete_ds.png")));
+		Texture::fromFile(&GetFileInPath("/content/images/Delete.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/Delete_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/Delete_dn.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/Delete_ds.png")));
 	instance->size = Vector2(40,46);
 	instance->position = Vector2(20, 284);
 	instance->setParent(this);
@@ -370,9 +360,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->setButtonListener(delet);

 	instance = makeImageButton(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraZoomIn.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraZoomIn_ovr.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraZoomIn_dn.png")));
+		Texture::fromFile(&GetFileInPath("/content/images/CameraZoomIn.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraZoomIn_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraZoomIn_dn.png")));
 	instance->size = Vector2(34,25);
 	instance->floatBottom = true;
 	instance->floatRight = true;
@@ -382,9 +372,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->setButtonListener(cam);

 	instance = makeImageButton(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraZoomOut.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraZoomOut_ovr.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraZoomOut_dn.png")));
+		Texture::fromFile(&GetFileInPath("/content/images/CameraZoomOut.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraZoomOut_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraZoomOut_dn.png")));
 	instance->size = Vector2(34,26);
 	instance->floatBottom = true;
 	instance->floatRight = true;
@@ -394,9 +384,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->setButtonListener(cam);

 	instance = makeImageButton(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraPanLeft.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraPanLeft_ovr.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraPanLeft_dn.png")));
+		Texture::fromFile(&GetFileInPath("/content/images/CameraPanLeft.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraPanLeft_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraPanLeft_dn.png")));
 	instance->size = Vector2(34,34);
 	instance->floatBottom = true;
 	instance->floatRight = true;
@@ -406,9 +396,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->setButtonListener(cam);

 	instance = makeImageButton(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraPanRight.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraPanRight_ovr.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraPanRight_dn.png")));
+		Texture::fromFile(&GetFileInPath("/content/images/CameraPanRight.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraPanRight_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraPanRight_dn.png")));
 	instance->size = Vector2(34,34);
 	instance->floatBottom = true;
 	instance->floatRight = true;
@@ -418,9 +408,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->setButtonListener(cam);

 	instance = makeImageButton(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraCenter.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraCenter_ovr.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraCenter_dn.png")));
+		Texture::fromFile(&GetFileInPath("/content/images/CameraCenter.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraCenter_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraCenter_dn.png")));
 	instance->size = Vector2(34,20);
 	instance->floatBottom = true;
 	instance->floatRight = true;
@@ -430,9 +420,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->setButtonListener(cam);

 	instance = makeImageButton(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraTiltUp.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraTiltUp_ovr.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraTiltUp_dn.png")));
+		Texture::fromFile(&GetFileInPath("/content/images/CameraTiltUp.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraTiltUp_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraTiltUp_dn.png")));
 	instance->size = Vector2(24,24);
 	instance->floatBottom = true;
 	instance->floatRight = true;
@@ -442,9 +432,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
 	instance->setButtonListener(cam);

 	instance = makeImageButton(
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraTiltDown.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraTiltDown_ovr.png")),
-		Texture::fromFile(VS03_WORKAROUND GetFileInPath("/content/images/CameraTiltDown_dn.png")));
+		Texture::fromFile(&GetFileInPath("/content/images/CameraTiltDown.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraTiltDown_ovr.png")),
+		Texture::fromFile(&GetFileInPath("/content/images/CameraTiltDown_dn.png")));
 	instance->size = Vector2(24,24);
 	instance->floatBottom = true;
 	instance->floatRight = true;
--- a/src/source/DataModelV2/ThumbnailGeneratorInstance.cpp
+++ b/src/source/DataModelV2/ThumbnailGeneratorInstance.cpp
--- a/src/source/Tool/DraggerTool.cpp
+++ b/src/source/Tool/DraggerTool.cpp
@@ -57,7 +57,7 @@ void DraggerTool::onMouseMoved(Mouse mouse)
 						break;
 				}

-				centerOffset = handles[handleGrabbed].center;
+				CenterOffset = handles[handleGrabbed].center;

 				Vector3 intersection1 = ray.intersection(mouse.getPlane());
 				Vector3 intersection2 = ray.intersection(mouse.getInversePlane());
@@ -77,7 +77,7 @@ void DraggerTool::onMouseMoved(Mouse mouse)
 					if ( ((int)part->getSize().z)%2 == 1 )
 						intersection1.z += 0.5;

-					part->setPosition(intersection1 + (part->getPosition() - centerOffset));
+					part->setPosition(intersection1 + (part->getPosition() - CenterOffset));
 				}
 				else if(intersection2.isFinite())
 				{
@@ -90,7 +90,7 @@ void DraggerTool::onMouseMoved(Mouse mouse)

 					//intersection2.y = mouse.getInversePlane() + part->getSize().y/2 - 0.5;

-					part->setPosition(intersection2 + (part->getPosition() - centerOffset));
+					part->setPosition(intersection2 + (part->getPosition() - CenterOffset));
 				}

 				float offset = 2;