Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
libretro-chailove
Commits
7186c991
Verified
Commit
7186c991
authored
Dec 12, 2017
by
RobLoach
Browse files
Update love::Types namespace
parent
adb8500c
Changes
40
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.md
View file @
7186c991
...
...
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
```
graphics.love.point(100,100).point(50, 200)
```
-
Moved
`Types`
namespace to
`love::Types`
## 0.11.1 - 2017-12-10
### Fixed
...
...
Makefile.common
View file @
7186c991
...
...
@@ -2,11 +2,7 @@
SOURCES_CXX
+=
$(
wildcard
\
src/
*
.cpp
\
src/love/
*
.cpp
\
src/Types/
*
.cpp
\
src/Types/Audio/
*
.cpp
\
src/Types/Graphics/
*
.cpp
\
src/Types/Input/
*
.cpp
\
src/Types/System/
*
.cpp
\
src/love/
*
/
*
.cpp
\
test
/
*
.cpp
\
)
...
...
src/ChaiLove.h
View file @
7186c991
...
...
@@ -59,7 +59,7 @@
#include "SDL.h"
#include "libretro.h"
#include "love/keyboard.h"
#include "Types/System/Config.h"
#include "
love/
Types/System/Config.h"
#include "love/script.h"
#include "love/filesystem.h"
#include "love/graphics.h"
...
...
@@ -79,7 +79,7 @@
#include "test/Test.h"
#endif
using
Types
::
System
::
Config
;
using
love
::
Types
::
System
::
Config
;
class
ChaiLove
{
public:
...
...
src/Types/Audio/AudioState.h
→
src/
love/
Types/Audio/AudioState.h
View file @
7186c991
#ifndef SRC_TYPES_AUDIO_AUDIOSTATE_H_
#define SRC_TYPES_AUDIO_AUDIOSTATE_H_
#ifndef SRC_
LOVE_
TYPES_AUDIO_AUDIOSTATE_H_
#define SRC_
LOVE_
TYPES_AUDIO_AUDIOSTATE_H_
namespace
love
{
namespace
Types
{
namespace
Audio
{
...
...
@@ -12,5 +13,6 @@ enum AudioState {
}
// namespace Audio
}
// namespace Types
}
// namespace love
#endif // SRC_TYPES_AUDIO_AUDIOSTATE_H_
#endif // SRC_
LOVE_
TYPES_AUDIO_AUDIOSTATE_H_
src/Types/Audio/SoundData.cpp
→
src/
love/
Types/Audio/SoundData.cpp
View file @
7186c991
...
...
@@ -5,6 +5,7 @@
#include "AudioState.h"
#include "physfs.h"
namespace
love
{
namespace
Types
{
namespace
Audio
{
...
...
@@ -102,3 +103,4 @@ SoundData& SoundData::setLooping(bool looping) {
}
// namespace Audio
}
// namespace Types
}
// namespace love
src/Types/Audio/SoundData.h
→
src/
love/
Types/Audio/SoundData.h
View file @
7186c991
#ifndef SRC_TYPES_AUDIO_SOUNDDATA_H_
#define SRC_TYPES_AUDIO_SOUNDDATA_H_
#ifndef SRC_
LOVE_
TYPES_AUDIO_SOUNDDATA_H_
#define SRC_
LOVE_
TYPES_AUDIO_SOUNDDATA_H_
#include <string>
#include "AudioState.h"
#include "physfs.h"
namespace
love
{
namespace
Types
{
namespace
Audio
{
...
...
@@ -96,5 +97,6 @@ class SoundData {
}
// namespace Audio
}
// namespace Types
}
// namespace love
#endif // SRC_TYPES_AUDIO_SOUNDDATA_H_
#endif // SRC_
LOVE_
TYPES_AUDIO_SOUNDDATA_H_
src/Types/Graphics/Color.cpp
→
src/
love/
Types/Graphics/Color.cpp
View file @
7186c991
#include "Color.h"
namespace
love
{
namespace
Types
{
namespace
Graphics
{
// Nothing.
...
...
src/Types/Graphics/Color.h
→
src/
love/
Types/Graphics/Color.h
View file @
7186c991
#ifndef SRC_TYPES_GRAPHICS_COLOR_H_
#define SRC_TYPES_GRAPHICS_COLOR_H_
#ifndef SRC_
LOVE_
TYPES_GRAPHICS_COLOR_H_
#define SRC_
LOVE_
TYPES_GRAPHICS_COLOR_H_
#include "SDL.h"
namespace
love
{
namespace
Types
{
namespace
Graphics
{
...
...
@@ -63,5 +64,6 @@ struct Color {
}
// namespace Graphics
}
// namespace Types
}
// namespace love
#endif // SRC_TYPES_GRAPHICS_COLOR_H_
#endif // SRC_
LOVE_
TYPES_GRAPHICS_COLOR_H_
src/Types/Graphics/Font.cpp
→
src/
love/
Types/Graphics/Font.cpp
View file @
7186c991
...
...
@@ -8,6 +8,7 @@
#include "Image.h"
#include <iostream>
namespace
love
{
namespace
Types
{
namespace
Graphics
{
...
...
@@ -149,3 +150,4 @@ void Font::print(const std::string& text, int x, int y, int r, int g, int b, int
}
// namespace Graphics
}
// namespace Types
}
// namespace love
src/Types/Graphics/Font.h
→
src/
love/
Types/Graphics/Font.h
View file @
7186c991
#ifndef SRC_TYPES_GRAPHICS_FONT_H_
#define SRC_TYPES_GRAPHICS_FONT_H_
#ifndef SRC_
LOVE_
TYPES_GRAPHICS_FONT_H_
#define SRC_
LOVE_
TYPES_GRAPHICS_FONT_H_
#include "SDL.h"
#include "SDL_ttf.h"
...
...
@@ -7,6 +7,7 @@
#include <SDL_fnt.h>
#include "Image.h"
namespace
love
{
namespace
Types
{
namespace
Graphics
{
...
...
@@ -50,5 +51,6 @@ class Font {
}
// namespace Graphics
}
// namespace Types
}
// namespace love
#endif // SRC_TYPES_GRAPHICS_FONT_H_
#endif // SRC_
LOVE_
TYPES_GRAPHICS_FONT_H_
src/Types/Graphics/Image.cpp
→
src/
love/
Types/Graphics/Image.cpp
View file @
7186c991
...
...
@@ -8,6 +8,7 @@
#include "../../ChaiLove.h"
namespace
love
{
namespace
Types
{
namespace
Graphics
{
...
...
@@ -85,3 +86,4 @@ int Image::getHeight() {
}
// namespace Graphics
}
// namespace Types
}
// namespace love
src/Types/Graphics/Image.h
→
src/
love/
Types/Graphics/Image.h
View file @
7186c991
#ifndef SRC_TYPES_GRAPHICS_IMAGE_H_
#define SRC_TYPES_GRAPHICS_IMAGE_H_
#ifndef SRC_
LOVE_
TYPES_GRAPHICS_IMAGE_H_
#define SRC_
LOVE_
TYPES_GRAPHICS_IMAGE_H_
#include <SDL.h>
#include <string>
namespace
love
{
namespace
Types
{
namespace
Graphics
{
...
...
@@ -32,5 +33,6 @@ class Image {
}
// namespace Graphics
}
// namespace Types
}
// namespace love
#endif // SRC_TYPES_GRAPHICS_IMAGE_H_
#endif // SRC_
LOVE_
TYPES_GRAPHICS_IMAGE_H_
src/Types/Graphics/Point.cpp
→
src/
love/
Types/Graphics/Point.cpp
View file @
7186c991
#include "Point.h"
namespace
love
{
namespace
Types
{
namespace
Graphics
{
// Nothing.
...
...
src/Types/Graphics/Point.h
→
src/
love/
Types/Graphics/Point.h
View file @
7186c991
#ifndef SRC_TYPES_GRAPHICS_POINT_H_
#define SRC_TYPES_GRAPHICS_POINT_H_
#ifndef SRC_
LOVE_
TYPES_GRAPHICS_POINT_H_
#define SRC_
LOVE_
TYPES_GRAPHICS_POINT_H_
namespace
love
{
namespace
Types
{
namespace
Graphics
{
...
...
@@ -32,5 +33,6 @@ struct Point {
}
// namespace Graphics
}
// namespace Types
}
// namespace love
#endif // SRC_TYPES_GRAPHICS_POINT_H_
#endif // SRC_
LOVE_
TYPES_GRAPHICS_POINT_H_
src/Types/Graphics/Quad.cpp
→
src/
love/
Types/Graphics/Quad.cpp
View file @
7186c991
#include "Quad.h"
#include "SDL.h"
namespace
love
{
namespace
Types
{
namespace
Graphics
{
...
...
@@ -28,3 +29,4 @@ SDL_Rect Quad::toRect() {
}
// namespace Graphics
}
// namespace Types
}
// namespace love
src/Types/Graphics/Quad.h
→
src/
love/
Types/Graphics/Quad.h
View file @
7186c991
#ifndef SRC_TYPES_GRAPHICS_QUAD_H_
#define SRC_TYPES_GRAPHICS_QUAD_H_
#ifndef SRC_
LOVE_
TYPES_GRAPHICS_QUAD_H_
#define SRC_
LOVE_
TYPES_GRAPHICS_QUAD_H_
#include "SDL.h"
namespace
love
{
namespace
Types
{
namespace
Graphics
{
...
...
@@ -41,5 +42,6 @@ class Quad {
}
// namespace Graphics
}
// namespace Types
}
// namespace love
#endif // SRC_TYPES_GRAPHICS_QUAD_H_
#endif // SRC_
LOVE_
TYPES_GRAPHICS_QUAD_H_
src/Types/Input/Joystick.cpp
→
src/
love/
Types/Input/Joystick.cpp
View file @
7186c991
...
...
@@ -3,6 +3,7 @@
#include "../../ChaiLove.h"
#include <string>
namespace
love
{
namespace
Types
{
namespace
Input
{
...
...
@@ -52,3 +53,4 @@ void Joystick::close() {
}
// namespace Input
}
// namespace Types
}
// namespace love
src/Types/Input/Joystick.h
→
src/
love/
Types/Input/Joystick.h
View file @
7186c991
#ifndef SRC_TYPES_INPUT_JOYSTICK_H_
#define SRC_TYPES_INPUT_JOYSTICK_H_
#ifndef SRC_
LOVE_
TYPES_INPUT_JOYSTICK_H_
#define SRC_
LOVE_
TYPES_INPUT_JOYSTICK_H_
#include <string>
namespace
love
{
namespace
Types
{
namespace
Input
{
...
...
@@ -49,5 +50,6 @@ class Joystick {
}
// namespace Input
}
// namespace Types
}
// namespace love
#endif // SRC_TYPES_INPUT_JOYSTICK_H_
#endif // SRC_
LOVE_
TYPES_INPUT_JOYSTICK_H_
src/Types/System/Config.cpp
→
src/
love/
Types/System/Config.cpp
View file @
7186c991
#include "Config.h"
#include "../../ChaiLove.h"
namespace
love
{
namespace
Types
{
namespace
System
{
...
...
@@ -12,3 +13,4 @@ Config::Config() {
}
// namespace System
}
// namespace Types
}
// namespace love
src/Types/System/Config.h
→
src/
love/
Types/System/Config.h
View file @
7186c991
#ifndef SRC_TYPES_SYSTEM_CONFIG_H_
#define SRC_TYPES_SYSTEM_CONFIG_H_
#ifndef SRC_
LOVE_
TYPES_SYSTEM_CONFIG_H_
#define SRC_
LOVE_
TYPES_SYSTEM_CONFIG_H_
#include <string>
#include <map>
namespace
love
{
namespace
Types
{
namespace
System
{
...
...
@@ -61,5 +62,6 @@ class Config {
}
// namespace System
}
// namespace Types
}
// namespace love
#endif // SRC_TYPES_SYSTEM_CONFIG_H_
#endif // SRC_
LOVE_
TYPES_SYSTEM_CONFIG_H_
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment