From 4e4b799fd6e01d077efadaae0bf97d8b281c7561 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Wed, 7 Mar 2018 20:03:41 +0900 Subject: [PATCH] Replace 'frustrum' with 'frustum' --- examples/primitive-shapes/primitive-shapes-example.cpp | 12 ++++++------ resources/images/conical-frustrum-button.png | Bin 3899 -> 0 bytes resources/images/conical-frustum-button.png | Bin 0 -> 3899 bytes 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 resources/images/conical-frustrum-button.png create mode 100644 resources/images/conical-frustum-button.png diff --git a/examples/primitive-shapes/primitive-shapes-example.cpp b/examples/primitive-shapes/primitive-shapes-example.cpp index 82772a3..29112a3 100644 --- a/examples/primitive-shapes/primitive-shapes-example.cpp +++ b/examples/primitive-shapes/primitive-shapes-example.cpp @@ -28,7 +28,7 @@ namespace { DEMO_IMAGE_DIR "sphere-button.png", DEMO_IMAGE_DIR "cone-button.png", - DEMO_IMAGE_DIR "conical-frustrum-button.png", + DEMO_IMAGE_DIR "conical-frustum-button.png", DEMO_IMAGE_DIR "cylinder-button.png", DEMO_IMAGE_DIR "cube-button.png", DEMO_IMAGE_DIR "bevelled-cube-button.png", @@ -413,13 +413,13 @@ public: mShapeTitle.SetProperty( TextLabel::Property::TEXT, SHAPE_TITLE_PREFIX + "Cone" ); } - //Sets the 3D model to a conical frustrum and modifies the sliders appropriately. - void LoadConicalFrustrum() + //Sets the 3D model to a conical frustum and modifies the sliders appropriately. + void LoadConicalFrustum() { InitialiseSlidersAndModel(); //Set up specific visual properties. - mVisualMap[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::CONICAL_FRUSTRUM; + mVisualMap[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::CONICAL_FRUSTUM; mVisualMap[ PrimitiveVisual::Property::SCALE_TOP_RADIUS ] = DEFAULT_SCALE_TOP_RADIUS; mVisualMap[ PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS ] = DEFAULT_SCALE_BOTTOM_RADIUS; mVisualMap[ PrimitiveVisual::Property::SCALE_HEIGHT ] = DEFAULT_SCALE_HEIGHT; @@ -439,7 +439,7 @@ public: mModel.SetProperty( Control::Property::BACKGROUND, Property::Value( mVisualMap ) ); //Update title. - mShapeTitle.SetProperty( TextLabel::Property::TEXT, SHAPE_TITLE_PREFIX + "Conical Frustrum" ); + mShapeTitle.SetProperty( TextLabel::Property::TEXT, SHAPE_TITLE_PREFIX + "Conical Frustum" ); } //Sets the 3D model to a cylinder and modifies the sliders appropriately. @@ -589,7 +589,7 @@ public: } case 2: { - LoadConicalFrustrum(); + LoadConicalFrustum(); break; } case 3: diff --git a/resources/images/conical-frustrum-button.png b/resources/images/conical-frustrum-button.png deleted file mode 100644 index c14c7e1..0000000 Binary files a/resources/images/conical-frustrum-button.png and /dev/null differ diff --git a/resources/images/conical-frustum-button.png b/resources/images/conical-frustum-button.png new file mode 100644 index 0000000..c14c7e1 Binary files /dev/null and b/resources/images/conical-frustum-button.png differ -- libgit2 0.21.4