Skip to content

Commit

Permalink
Update binaries for version 0.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
rudy-digipen committed Feb 15, 2021
1 parent c5e321c commit a31f07e
Show file tree
Hide file tree
Showing 19 changed files with 88 additions and 44 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# doodle-release

Version 0.2.2
Version 0.2.4

Binaries built with Visual Studio 2019 Version **`16.8.4`**

Expand Down Expand Up @@ -47,6 +47,7 @@ int main(void)
## Notable Changes
- added functionality to draw to an image rather than the window
- The doodle Image class can now be copied like normal objects.
* It is more flexible when it is created in a global scope, so debug builds shouldn't see any popups from OpenGL asserts.
* Got rid of the `Image::color` type. Now there is only one color type, which is `doodle::Color`
Expand Down
Binary file modified doodle_development/bin/Debug/Win32/doodle.lib
Binary file not shown.
Binary file modified doodle_development/bin/Debug/Win32/doodle.pdb
Binary file not shown.
Binary file modified doodle_development/bin/Debug/x64/doodle.lib
Binary file not shown.
Binary file modified doodle_development/bin/Debug/x64/doodle.pdb
Binary file not shown.
Binary file modified doodle_development/bin/Release/Win32/doodle.lib
Binary file not shown.
Binary file modified doodle_development/bin/Release/x64/doodle.lib
Binary file not shown.
2 changes: 1 addition & 1 deletion doodle_development/include/doodle/angle.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------*
Copyright (C) 2019 Rudy Castan
Copyright (C) 2021 Rudy Castan
This file is distributed WITHOUT ANY WARRANTY. See the file
`License.md' for details.
Expand Down
2 changes: 1 addition & 1 deletion doodle_development/include/doodle/color.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------*
Copyright (C) 2019 Rudy Castan
Copyright (C) 2021 Rudy Castan
This file is distributed WITHOUT ANY WARRANTY. See the file
`License.md' for details.
Expand Down
28 changes: 15 additions & 13 deletions doodle_development/include/doodle/doodle.hpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
/*--------------------------------------------------------------*
Copyright (C) 2019 Rudy Castan
Copyright (C) 2021 Rudy Castan
This file is distributed WITHOUT ANY WARRANTY. See the file
`License.md' for details.
*--------------------------------------------------------------*/
#pragma once

#include <doodle/angle.hpp>
#include <doodle/color.hpp>
#include <doodle/drawing.hpp>
#include <doodle/environment.hpp>
#include <doodle/eventhook.hpp>
#include <doodle/image.hpp>
#include <doodle/input.hpp>
#include <doodle/noise.hpp>
#include <doodle/random.hpp>
#include <doodle/version.hpp>
#include <doodle/window.hpp>

/**
* \mainpage
* \section Angles
Expand Down Expand Up @@ -98,6 +110,8 @@
* \subsection creating Creating Images
* - doodle::Image
* - capture_screenshot_to_image()
* - begin_drawing_to_image()
* - end_drawing_to_image()
* \subsection display Displaying Images
* - draw_image()
* - set_tint_color()
Expand Down Expand Up @@ -129,15 +143,3 @@
* - to_wstring()
*
*/

#include <doodle/angle.hpp>
#include <doodle/color.hpp>
#include <doodle/drawing.hpp>
#include <doodle/environment.hpp>
#include <doodle/eventhook.hpp>
#include <doodle/image.hpp>
#include <doodle/input.hpp>
#include <doodle/noise.hpp>
#include <doodle/random.hpp>
#include <doodle/version.hpp>
#include <doodle/window.hpp>
41 changes: 36 additions & 5 deletions doodle_development/include/doodle/drawing.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------*
Copyright (C) 2019 Rudy Castan
Copyright (C) 2021 Rudy Castan
This file is distributed WITHOUT ANY WARRANTY. See the file
`License.md' for details.
Expand Down Expand Up @@ -510,8 +510,9 @@ namespace doodle
* \brief Given a file path to a *.fnt file it will create a distance field bitmap font.
*
* It will parse that file to get all of the Bitmap information and create GPU texture instances of all the image
* files listed. It assumes that the image files are in the same folder directory as the provided *.fnt file. It will
* return a positive value on success and a negative value if it failed to parse the *.fnt file for whatever reason.
* files listed. It assumes that the image files are in the same folder directory as the provided *.fnt file. It
* will return a positive value on success and a negative value if it failed to parse the *.fnt file for whatever
* reason.
*
* The default font, provided with doodle has a font ID of \f$0\f$ and is specified by doodle::DEFAULT_FONT_ID.
*
Expand Down Expand Up @@ -715,7 +716,7 @@ namespace doodle
*
*/
void draw_image(const Image& image, double x, double y, double width, double height, int texel_x,
int texel_y) noexcept;
int texel_y) noexcept;
/**
* \brief Draw a subsection of the image to the screen.
*
Expand Down Expand Up @@ -757,7 +758,7 @@ namespace doodle
*
*/
void draw_image(const Image& image, double x, double y, double width, double height, int texel_x, int texel_y,
int texel_width, int texel_height) noexcept;
int texel_width, int texel_height) noexcept;
/**
* \brief Sets the fill value for displaying images to the specified HexColor.
*
Expand Down Expand Up @@ -915,6 +916,36 @@ namespace doodle
*
*/
void apply_matrix(double a, double b, double c, double d, double e, double f) noexcept;

/** @} */

/**
* * \addtogroup Image
* Functions for drawing to an Image.
* @{
*/

/**
* \brief Redirect all draw command to draw to an image
* \param image_width The desired width of the image
* \param image_height The desired height of the image
* \param apply_antialiasing Should multi-sample anti-aliasing be applied?
*
* \include begin_drawing_to_image.cpp
*
*/
void begin_drawing_to_image(int image_width, int image_height, bool apply_antialiasing = false);

/**
* \brief End a session of drawing to an image
* \param smooth_texture Should the texture use a smooth filtering when being drawn
* \return An Image representing what was drawn.
*
* \include end_drawing_to_image.cpp
*
*/
Image end_drawing_to_image(bool smooth_texture = false);

/** @} */

}
2 changes: 1 addition & 1 deletion doodle_development/include/doodle/environment.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------*
Copyright (C) 2019 Rudy Castan
Copyright (C) 2021 Rudy Castan
This file is distributed WITHOUT ANY WARRANTY. See the file
`License.md' for details.
Expand Down
2 changes: 1 addition & 1 deletion doodle_development/include/doodle/eventhook.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
/*--------------------------------------------------------------*
Copyright (C) 2019 Rudy Castan
Copyright (C) 2021 Rudy Castan
This file is distributed WITHOUT ANY WARRANTY. See the file
`License.md' for details.
Expand Down
40 changes: 25 additions & 15 deletions doodle_development/include/doodle/image.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------*
Copyright (C) 2019 Rudy Castan
Copyright (C) 2021 Rudy Castan
This file is distributed WITHOUT ANY WARRANTY. See the file
`License.md' for details.
Expand Down Expand Up @@ -178,7 +178,7 @@ namespace doodle
*
* Usage of this will trigger creating a new GPU texture when the Image is drawn via draw_image().
*
* Having a begin/end interface enables the Image class to be used with for range loops and the std <algorithm>
* Having a begin/end interface enables the Image class to be used with for range loops and the std `<algorithm>`
* functions.
*
* \return iterator to the first element
Expand All @@ -187,8 +187,14 @@ namespace doodle
*/
Color* begin();
/**
* \brief
* \return
* \brief Returns an iterator to the color following the last color of the Image.
*
* This color acts as a placeholder; attempting to access it results in undefined behavior.
*
* Having a begin/end interface enables the Image class to be used with for range loops and the std
* `<algorithm>` functions.
*
* \return iterator to a color following the last color
*
*
*/
Expand All @@ -197,22 +203,22 @@ namespace doodle
/**
* \brief Returns a const iterator to the first color of the Image.
*
* Having a begin/end interface enables the Image class to be used with for range loops and the std <algorithm>
* Having a begin/end interface enables the Image class to be used with for range loops and the std `<algorithm>`
* functions.
*
* \return const iterator to the first element
*
*
*
* \include ImageClass_begin_const.cpp
*
*
*/
const Color* begin() const;
/**
* \brief Returns a const iterator to the color following the last color of the Image.
*
* This color acts as a placeholder; attempting to access it results in undefined behavior.
*
* Having a begin/end interface enables the Image class to be used with for range loops and the std <algorithm>
* Having a begin/end interface enables the Image class to be used with for range loops and the std `<algorithm>`
* functions.
*
* \return const iterator to a color following the last color
Expand All @@ -226,13 +232,17 @@ namespace doodle
std::shared_ptr<ImageImpl> impl{};

private:
friend void draw_image(const Image& image, double x, double y) noexcept;
friend void draw_image(const Image& image, double x, double y, double width, double height) noexcept;
friend void draw_image(const Image& image, double x, double y, double width, double height) noexcept;
friend void draw_image(const Image& image, double x, double y, double width, double height, int texel_x,
int texel_y) noexcept;
friend void draw_image(const Image& image, double x, double y, double width, double height, int texel_x,
int texel_y, int texel_width, int texel_height) noexcept;
friend void draw_image(const Image& image, double x, double y) noexcept;
friend void draw_image(const Image& image, double x, double y, double width, double height) noexcept;
friend void draw_image(const Image& image, double x, double y, double width, double height) noexcept;
friend void draw_image(const Image& image, double x, double y, double width, double height, int texel_x,
int texel_y) noexcept;
friend void draw_image(const Image& image, double x, double y, double width, double height, int texel_x,
int texel_y, int texel_width, int texel_height) noexcept;
friend Image end_drawing_to_image(bool smooth_texture);

public:
explicit Image(const std::shared_ptr<ImageImpl>& impl);
};
/** @} */
}
2 changes: 1 addition & 1 deletion doodle_development/include/doodle/input.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------*
Copyright (C) 2019 Rudy Castan
Copyright (C) 2021 Rudy Castan
This file is distributed WITHOUT ANY WARRANTY. See the file
`License.md' for details.
Expand Down
2 changes: 1 addition & 1 deletion doodle_development/include/doodle/noise.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------*
Copyright (C) 2019 Rudy Castan
Copyright (C) 2021 Rudy Castan
This file is distributed WITHOUT ANY WARRANTY. See the file
`License.md' for details.
Expand Down
2 changes: 1 addition & 1 deletion doodle_development/include/doodle/random.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------*
Copyright (C) 2019 Rudy Castan
Copyright (C) 2021 Rudy Castan
This file is distributed WITHOUT ANY WARRANTY. See the file
`License.md' for details.
Expand Down
4 changes: 2 additions & 2 deletions doodle_development/include/doodle/version.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------*
Copyright (C) 2019 Rudy Castan
Copyright (C) 2021 Rudy Castan
This file is distributed WITHOUT ANY WARRANTY. See the file
`License.md' for details.
Expand All @@ -9,5 +9,5 @@

namespace doodle
{
constexpr auto VERSION = "0.2.3";
constexpr auto VERSION = "0.2.4";
}
2 changes: 1 addition & 1 deletion doodle_development/include/doodle/window.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------*
Copyright (C) 2019 Rudy Castan
Copyright (C) 2021 Rudy Castan
This file is distributed WITHOUT ANY WARRANTY. See the file
`License.md' for details.
Expand Down

0 comments on commit a31f07e

Please sign in to comment.