From 2af1be327ace4c3b11c587b6993df2c25d4464b5 Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Mon, 15 Mar 2021 16:24:38 -0700 Subject: [PATCH] New icon given by modnark --- Blocks3D.vcproj | 4 ++++ Dialogs.rc | 6 +++--- roblox_RN1_icon.ico | Bin 0 -> 29750 bytes src/source/Application.cpp | 16 ++++++++++++++-- src/source/DataModelV2/PartInstance.cpp | 2 +- 5 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 roblox_RN1_icon.ico 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 0000000000000000000000000000000000000000..e3d87e69200a4181e6152d4855c66125ad199bc0 GIT binary patch literal 29750 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
    OSdw348|CYBO z^S`76p06CA&1LnX|I87ELhnU_Fcj(He=*qx22tWRpfBlF-_#VSZ#tk~-*iB~zUhE| zeS>(LP~XcmE|SKY(je3@jnzz}#jwcq=}C=VCVWq7G??&Jc9hTI%cDtWf=P!BOgioT Ee}g%u3jhEB literal 0 HcmV?d00001 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;