diff --git a/Blocks3D.vcproj b/Blocks3D.vcproj index 8fc48b9..01d89c1 100644 --- a/Blocks3D.vcproj +++ b/Blocks3D.vcproj @@ -878,6 +878,10 @@ RelativePath=".\Parts.bmp" > + + diff --git a/Dialogs.rc b/Dialogs.rc index b4c19ae..c366169 100644 --- a/Dialogs.rc +++ b/Dialogs.rc @@ -5,7 +5,7 @@ #include #include #include -#include "src/include/resource.h" //Should not have to do this... +#include "src/include/resource.h" @@ -39,5 +39,5 @@ FONT 8, "Ms Shell Dlg" // // Icon resources // -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN -IDI_ICON1 ICON "icon1.ico" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +IDI_ICON1 ICON "roblox_RN1_icon.ico" diff --git a/roblox_RN1_icon.ico b/roblox_RN1_icon.ico new file mode 100644 index 0000000..e3d87e6 Binary files /dev/null and b/roblox_RN1_icon.ico differ diff --git a/src/source/Application.cpp b/src/source/Application.cpp index cd5e1ce..b7467e3 100644 --- a/src/source/Application.cpp +++ b/src/source/Application.cpp @@ -30,6 +30,7 @@ #include "Listener/DeleteListener.h" #include "Listener/CameraButtonListener.h" #include "Listener/RotateButtonListener.h" +#include "Faces.h" #define LEGACY_LOAD_G3DFUN_LEVEL //Ray testRay; //static int cursorid = 0; @@ -196,61 +197,70 @@ void Application::onInit() { test->setSize(Vector3(24,1,24)); test->setPosition(Vector3(0,0,0)); test->setCFrame(test->getCFrame() * Matrix3::fromEulerAnglesXYZ(0,toRadians(0),toRadians(0))); - - + test->setSurface(TOP, Enum::SurfaceType::Bumps); test = makePart(); test->setParent(_dataModel->getWorkspace()); test->color = Color3(.5F,1,.5F); test->setSize(Vector3(4,1,2)); test->setPosition(Vector3(-10,1,0)); + test->setSurface(TOP, Enum::SurfaceType::Bumps); + test = makePart(); test->setParent(_dataModel->getWorkspace()); test->color = Color3(.5F,1,.5F); test->setSize(Vector3(4,1,2)); test->setPosition(Vector3(10,1,0)); + test->setSurface(TOP, Enum::SurfaceType::Bumps); test = makePart(); test->setParent(_dataModel->getWorkspace()); test->color = Color3::gray(); test->setSize(Vector3(4,1,2)); test->setPosition(Vector3(7,2,0)); + test->setSurface(TOP, Enum::SurfaceType::Bumps); test = makePart(); test->setParent(_dataModel->getWorkspace()); test->color = Color3::gray(); test->setSize(Vector3(4,1,2)); test->setPosition(Vector3(-7,2,0)); + test->setSurface(TOP, Enum::SurfaceType::Bumps); test = makePart(); test->setParent(_dataModel->getWorkspace()); test->color = Color3::gray(); test->setSize(Vector3(4,1,2)); test->setPosition(Vector3(4,3,0)); + test->setSurface(TOP, Enum::SurfaceType::Bumps); test = makePart(); test->setParent(_dataModel->getWorkspace()); test->color = Color3::gray(); test->setSize(Vector3(4,1,2)); test->setPosition(Vector3(-5,3,0)); + test->setSurface(TOP, Enum::SurfaceType::Bumps); test = makePart(); test->setParent(_dataModel->getWorkspace()); test->color = Color3::gray(); test->setSize(Vector3(4,1,2)); test->setPosition(Vector3(1,4,0)); + test->setSurface(TOP, Enum::SurfaceType::Bumps); test = makePart(); test->setParent(_dataModel->getWorkspace()); test->color = Color3::gray(); test->setSize(Vector3(4,1,2)); test->setPosition(Vector3(-3,4,0)); + test->setSurface(TOP, Enum::SurfaceType::Bumps); test = makePart(); test->setParent(_dataModel->getWorkspace()); test->color = Color3::gray(); test->setSize(Vector3(4,1,2)); test->setPosition(Vector3(-2,5,0)); + test->setSurface(TOP, Enum::SurfaceType::Bumps); @@ -260,12 +270,14 @@ void Application::onInit() { test->color = Color3::gray(); test->setSize(Vector3(4,1,2)); test->setPosition(Vector3(0,6,0)); + test->setSurface(TOP, Enum::SurfaceType::Bumps); test = makePart(); test->setParent(_dataModel->getWorkspace()); test->color = Color3::gray(); test->setSize(Vector3(4,1,2)); test->setPosition(Vector3(2,7,0)); + test->setSurface(TOP, Enum::SurfaceType::Bumps); #else _dataModel->debugGetOpen(); #endif diff --git a/src/source/DataModelV2/PartInstance.cpp b/src/source/DataModelV2/PartInstance.cpp index 9feeb04..bcb3eeb 100644 --- a/src/source/DataModelV2/PartInstance.cpp +++ b/src/source/DataModelV2/PartInstance.cpp @@ -19,7 +19,7 @@ PartInstance::PartInstance(void) velocity = Vector3(0,0,0); rotVelocity = Vector3(0,0,0); top = Enum::SurfaceType::Smooth; - front = Enum::SurfaceType::Bumps; + front = Enum::SurfaceType::Smooth; right = Enum::SurfaceType::Smooth; back = Enum::SurfaceType::Smooth; left = Enum::SurfaceType::Smooth;