[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4190 - in trunk/pingus: . external src/engine/display src/
From: |
grumbel |
Subject: |
[Pingus-CVS] r4190 - in trunk/pingus: . external src/engine/display src/engine/input src/engine/screen src/lisp src/pingus src/pingus/components src/pingus/screens src/pingus/worldmap |
Date: |
Sun, 28 Aug 2011 23:06:50 +0200 |
Author: grumbel
Date: 2011-08-28 23:06:50 +0200 (Sun, 28 Aug 2011)
New Revision: 4190
Modified:
trunk/pingus/SConscript
trunk/pingus/external/
trunk/pingus/src/engine/display/delta_framebuffer.hpp
trunk/pingus/src/engine/display/display.cpp
trunk/pingus/src/engine/display/display.hpp
trunk/pingus/src/engine/input/manager.cpp
trunk/pingus/src/engine/screen/screen_manager.cpp
trunk/pingus/src/engine/screen/screen_manager.hpp
trunk/pingus/src/lisp/parser.cpp
trunk/pingus/src/pingus/components/playfield.hpp
trunk/pingus/src/pingus/components/smallmap.cpp
trunk/pingus/src/pingus/components/smallmap.hpp
trunk/pingus/src/pingus/screens/demo_session.cpp
trunk/pingus/src/pingus/screens/demo_session.hpp
trunk/pingus/src/pingus/screens/game_session.cpp
trunk/pingus/src/pingus/screens/game_session.hpp
trunk/pingus/src/pingus/screens/pingus_menu.cpp
trunk/pingus/src/pingus/screens/pingus_menu.hpp
trunk/pingus/src/pingus/screens/story_screen.hpp
trunk/pingus/src/pingus/server.cpp
trunk/pingus/src/pingus/server.hpp
trunk/pingus/src/pingus/worldmap/worldmap_component.hpp
trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp
Log:
Build with -std=c++0x by default, replaced std::auto_ptr<> with
std::unique_ptr<>
Modified: trunk/pingus/SConscript
===================================================================
--- trunk/pingus/SConscript 2011-08-28 20:59:18 UTC (rev 4189)
+++ trunk/pingus/SConscript 2011-08-28 21:06:50 UTC (rev 4190)
@@ -104,6 +104,7 @@
self.opts.Add('optional_sources', 'Additional source files', [])
self.env = Environment(options = self.opts)
+ self.env.Append(CXXFLAGS = ["-std=c++0x"])
self.env.Append(CPPDEFINES = [('VERSION', '"\\"0.8.0\\""')])
Help(self.opts.GenerateHelpText(self.env))
@@ -115,7 +116,7 @@
if os.environ.has_key('PKG_CONFIG_PATH'):
self.env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
- self.env.Append(CPPPATH = ['.', 'src/', 'external/'])
+ self.env.Append(CPPPATH = ['.', 'src/'])
self.conf = self.env.Configure(custom_tests = {
'CheckMyProgram' : CheckMyProgram,
@@ -211,10 +212,10 @@
self.conf.env.Append(CPPDEFINES = [('ICONV_CONST', iconv_const)])
def build(self):
- self.env.Append(CPPPATH = ['.', 'src/'])
+ self.env.Append(CPPPATH = ['.', 'src/', 'external/tinygettext/'])
libpingus = self.env.StaticLibrary('pingus',
- Glob('external/tinygettext/*.cpp')
+ \
+
Glob('external/tinygettext/tinygettext/*.cpp') + \
Glob('src/editor/*.cpp') + \
Glob('src/engine/display/*.cpp') + \
Glob('src/engine/gui/*.cpp') + \
@@ -238,8 +239,9 @@
self.env.Program('pingus', ['src/main.cpp', libpingus])
- for filename in Glob("test/*_test.cpp", strings=True):
- self.env.Program(filename[:-4], [filename, libpingus])
+ if False:
+ for filename in Glob("test/*_test.cpp", strings=True):
+ self.env.Program(filename[:-4], [filename, libpingus])
project = Project()
project.configure()
Property changes on: trunk/pingus/external
___________________________________________________________________
Modified: svn:externals
- tinygettext http://tinygettext.googlecode.com/svn/trunk/tinygettext/
+ tinygettext
http://tinygettext.googlecode.com/svn/branches/tinygettext-c++11
Modified: trunk/pingus/src/engine/display/delta_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/delta_framebuffer.hpp 2011-08-28
20:59:18 UTC (rev 4189)
+++ trunk/pingus/src/engine/display/delta_framebuffer.hpp 2011-08-28
21:06:50 UTC (rev 4190)
@@ -25,9 +25,9 @@
class DeltaFramebuffer : public Framebuffer
{
private:
- std::auto_ptr<SDLFramebuffer> framebuffer;
- std::auto_ptr<DrawOpBuffer> frontbuffer;
- std::auto_ptr<DrawOpBuffer> backbuffer;
+ std::unique_ptr<SDLFramebuffer> framebuffer;
+ std::unique_ptr<DrawOpBuffer> frontbuffer;
+ std::unique_ptr<DrawOpBuffer> backbuffer;
public:
DeltaFramebuffer();
Modified: trunk/pingus/src/engine/display/display.cpp
===================================================================
--- trunk/pingus/src/engine/display/display.cpp 2011-08-28 20:59:18 UTC (rev
4189)
+++ trunk/pingus/src/engine/display/display.cpp 2011-08-28 21:06:50 UTC (rev
4190)
@@ -27,7 +27,7 @@
#include "engine/display/delta_framebuffer.hpp"
#include "engine/display/null_framebuffer.hpp"
-std::auto_ptr<Framebuffer> Display::framebuffer;
+std::unique_ptr<Framebuffer> Display::framebuffer;
void
Display::flip_display()
@@ -80,23 +80,23 @@
{
case OPENGL_FRAMEBUFFER:
#ifdef HAVE_OPENGL
- framebuffer = std::auto_ptr<Framebuffer>(new OpenGLFramebuffer());
+ framebuffer = std::unique_ptr<Framebuffer>(new OpenGLFramebuffer());
#else
throw std::runtime_error("OpenGL support was not compiled in");
#endif
break;
case NULL_FRAMEBUFFER:
- framebuffer = std::auto_ptr<Framebuffer>(new NullFramebuffer());
+ framebuffer = std::unique_ptr<Framebuffer>(new NullFramebuffer());
break;
case DELTA_FRAMEBUFFER:
globals::static_graphics = true;
- framebuffer = std::auto_ptr<Framebuffer>(new DeltaFramebuffer());
+ framebuffer = std::unique_ptr<Framebuffer>(new DeltaFramebuffer());
break;
case SDL_FRAMEBUFFER:
- framebuffer = std::auto_ptr<Framebuffer>(new SDLFramebuffer());
+ framebuffer = std::unique_ptr<Framebuffer>(new SDLFramebuffer());
break;
default:
Modified: trunk/pingus/src/engine/display/display.hpp
===================================================================
--- trunk/pingus/src/engine/display/display.hpp 2011-08-28 20:59:18 UTC (rev
4189)
+++ trunk/pingus/src/engine/display/display.hpp 2011-08-28 21:06:50 UTC (rev
4190)
@@ -30,7 +30,7 @@
class Display
{
private:
- static std::auto_ptr<Framebuffer> framebuffer;
+ static std::unique_ptr<Framebuffer> framebuffer;
public:
static void flip_display();
Modified: trunk/pingus/src/engine/input/manager.cpp
===================================================================
--- trunk/pingus/src/engine/input/manager.cpp 2011-08-28 20:59:18 UTC (rev
4189)
+++ trunk/pingus/src/engine/input/manager.cpp 2011-08-28 21:06:50 UTC (rev
4190)
@@ -82,7 +82,7 @@
Controller*
Manager::create_controller(const Pathname& filename)
{
- std::auto_ptr<Controller> controller(new Controller(desc));
+ std::unique_ptr<Controller> controller(new Controller(desc));
FileReader reader = FileReader::parse(filename);
Modified: trunk/pingus/src/engine/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/engine/screen/screen_manager.cpp 2011-08-28 20:59:18 UTC
(rev 4189)
+++ trunk/pingus/src/engine/screen/screen_manager.cpp 2011-08-28 21:06:50 UTC
(rev 4190)
@@ -147,17 +147,17 @@
assert(instance_ == 0);
instance_ = this;
- input_manager = std::auto_ptr<Input::Manager>(new Input::Manager());
+ input_manager = std::unique_ptr<Input::Manager>(new Input::Manager());
if (globals::controller_file.empty())
- input_controller =
std::auto_ptr<Input::Controller>(input_manager->create_controller(Pathname("controller/default.scm",
+ input_controller =
std::unique_ptr<Input::Controller>(input_manager->create_controller(Pathname("controller/default.scm",
Pathname::DATA_PATH)));
else
- input_controller =
std::auto_ptr<Input::Controller>(input_manager->create_controller(Pathname(globals::controller_file,
+ input_controller =
std::unique_ptr<Input::Controller>(input_manager->create_controller(Pathname(globals::controller_file,
Pathname::SYSTEM_PATH)));
cursor = Sprite("core/cursors/animcross");
- fps_counter = std::auto_ptr<FPSCounter>(new FPSCounter());
+ fps_counter = std::unique_ptr<FPSCounter>(new FPSCounter());
}
ScreenManager::~ScreenManager()
Modified: trunk/pingus/src/engine/screen/screen_manager.hpp
===================================================================
--- trunk/pingus/src/engine/screen/screen_manager.hpp 2011-08-28 20:59:18 UTC
(rev 4189)
+++ trunk/pingus/src/engine/screen/screen_manager.hpp 2011-08-28 21:06:50 UTC
(rev 4190)
@@ -42,12 +42,12 @@
private:
static ScreenManager* instance_;
- std::auto_ptr<Input::Manager> input_manager;
- std::auto_ptr<Input::Controller> input_controller;
+ std::unique_ptr<Input::Manager> input_manager;
+ std::unique_ptr<Input::Controller> input_controller;
- std::auto_ptr<DrawingContext> display_gc;
+ std::unique_ptr<DrawingContext> display_gc;
- std::auto_ptr<FPSCounter> fps_counter;
+ std::unique_ptr<FPSCounter> fps_counter;
Sprite cursor;
/** Screen stack (first is the screen, second is delete_screen,
Modified: trunk/pingus/src/lisp/parser.cpp
===================================================================
--- trunk/pingus/src/lisp/parser.cpp 2011-08-28 20:59:18 UTC (rev 4189)
+++ trunk/pingus/src/lisp/parser.cpp 2011-08-28 21:06:50 UTC (rev 4190)
@@ -78,7 +78,7 @@
boost::shared_ptr<Lisp>
Parser::parse(std::istream& stream, const std::string& filename)
{
- std::auto_ptr<Parser> parser (new Parser());
+ std::unique_ptr<Parser> parser (new Parser());
parser->filename = filename;
parser->lexer = new Lexer(stream);
Modified: trunk/pingus/src/pingus/components/playfield.hpp
===================================================================
--- trunk/pingus/src/pingus/components/playfield.hpp 2011-08-28 20:59:18 UTC
(rev 4189)
+++ trunk/pingus/src/pingus/components/playfield.hpp 2011-08-28 21:06:50 UTC
(rev 4190)
@@ -44,7 +44,7 @@
Vector2i scroll_center;
- std::auto_ptr<SceneContext> scene_context;
+ std::unique_ptr<SceneContext> scene_context;
GraphicContextState state;
CaptureRectangle capture_rectangle;
Modified: trunk/pingus/src/pingus/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/pingus/components/smallmap.cpp 2011-08-28 20:59:18 UTC
(rev 4189)
+++ trunk/pingus/src/pingus/components/smallmap.cpp 2011-08-28 21:06:50 UTC
(rev 4190)
@@ -34,7 +34,7 @@
has_focus(),
gc_ptr(0)
{
- image = std::auto_ptr<SmallMapImage>(new SmallMapImage(server,
rect.get_width(), rect.get_height()));
+ image = std::unique_ptr<SmallMapImage>(new SmallMapImage(server,
rect.get_width(), rect.get_height()));
scroll_mode = false;
}
Modified: trunk/pingus/src/pingus/components/smallmap.hpp
===================================================================
--- trunk/pingus/src/pingus/components/smallmap.hpp 2011-08-28 20:59:18 UTC
(rev 4189)
+++ trunk/pingus/src/pingus/components/smallmap.hpp 2011-08-28 21:06:50 UTC
(rev 4190)
@@ -38,7 +38,7 @@
/** Graphic surface of the entrance */
Sprite entrance_sur;
- std::auto_ptr<SmallMapImage> image;
+ std::unique_ptr<SmallMapImage> image;
/** Indicates whether the playfield should can be scrolled around depending
on the position of the cursor in the small map */
Modified: trunk/pingus/src/pingus/screens/demo_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/demo_session.cpp 2011-08-28 20:59:18 UTC
(rev 4189)
+++ trunk/pingus/src/pingus/screens/demo_session.cpp 2011-08-28 21:06:50 UTC
(rev 4190)
@@ -84,7 +84,7 @@
fast_forward(false)
{
// Load Demo file
- demo = std::auto_ptr<PingusDemo>(new PingusDemo(pathname));
+ demo = std::unique_ptr<PingusDemo>(new PingusDemo(pathname));
events = demo->get_events();
// Reverse the vector so that we can use pop_back()
@@ -100,7 +100,7 @@
<< plf.get_checksum() << ")" << std::endl;
}
- server = std::auto_ptr<Server>(new Server(plf, false));
+ server = std::unique_ptr<Server>(new Server(plf, false));
// Create GUI
pcounter = new PingusCounter(server.get());
Modified: trunk/pingus/src/pingus/screens/demo_session.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/demo_session.hpp 2011-08-28 20:59:18 UTC
(rev 4189)
+++ trunk/pingus/src/pingus/screens/demo_session.hpp 2011-08-28 21:06:50 UTC
(rev 4190)
@@ -47,8 +47,8 @@
private:
Pathname pathname;
- std::auto_ptr<Server> server;
- std::auto_ptr<PingusDemo> demo;
+ std::unique_ptr<Server> server;
+ std::unique_ptr<PingusDemo> demo;
std::vector<ServerEvent> events;
PingusCounter* pcounter;
Modified: trunk/pingus/src/pingus/screens/game_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.cpp 2011-08-28 20:59:18 UTC
(rev 4189)
+++ trunk/pingus/src/pingus/screens/game_session.cpp 2011-08-28 21:06:50 UTC
(rev 4190)
@@ -51,7 +51,7 @@
pause(false),
fast_forward(false)
{
- server = std::auto_ptr<Server>(new Server(plf, true));
+ server = std::unique_ptr<Server>(new Server(plf, true));
// the world is initially on time
world_delay = 0;
Modified: trunk/pingus/src/pingus/screens/game_session.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.hpp 2011-08-28 20:59:18 UTC
(rev 4189)
+++ trunk/pingus/src/pingus/screens/game_session.hpp 2011-08-28 21:06:50 UTC
(rev 4190)
@@ -51,7 +51,7 @@
bool show_result_screen;
/// The server
- std::auto_ptr<Server> server;
+ std::unique_ptr<Server> server;
int world_delay; ///< how many milliseconds is the world behind the actual
time
Modified: trunk/pingus/src/pingus/screens/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/pingus_menu.cpp 2011-08-28 20:59:18 UTC
(rev 4189)
+++ trunk/pingus/src/pingus/screens/pingus_menu.cpp 2011-08-28 21:06:50 UTC
(rev 4190)
@@ -110,7 +110,7 @@
else
#endif
{
- std::auto_ptr<WorldmapNS::WorldmapScreen> worldmap_screen(new
WorldmapNS::WorldmapScreen());
+ std::unique_ptr<WorldmapNS::WorldmapScreen> worldmap_screen(new
WorldmapNS::WorldmapScreen());
worldmap_screen->load(filename);
ScreenManager::instance()->push_screen(worldmap_screen.release());
}
@@ -206,7 +206,7 @@
PingusMenu::create_background(const Size& size_)
{
// Recreate the layer manager in the new size
- background = std::auto_ptr<LayerManager>(new LayerManager());
+ background = std::unique_ptr<LayerManager>(new LayerManager());
Surface layer1 = Resource::load_surface("core/menu/layer1");
Surface layer2 = Resource::load_surface("core/menu/layer2");
Modified: trunk/pingus/src/pingus/screens/pingus_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/pingus_menu.hpp 2011-08-28 20:59:18 UTC
(rev 4189)
+++ trunk/pingus/src/pingus/screens/pingus_menu.hpp 2011-08-28 21:06:50 UTC
(rev 4190)
@@ -42,7 +42,7 @@
float text_scroll_offset;
private:
- std::auto_ptr<LayerManager> background;
+ std::unique_ptr<LayerManager> background;
Sprite logo;
MenuButton* start_button;
Modified: trunk/pingus/src/pingus/screens/story_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/story_screen.hpp 2011-08-28 20:59:18 UTC
(rev 4189)
+++ trunk/pingus/src/pingus/screens/story_screen.hpp 2011-08-28 21:06:50 UTC
(rev 4190)
@@ -37,7 +37,7 @@
class StoryScreen : public GUIScreen
{
private:
- std::auto_ptr<WorldmapNS::WorldmapStory> story;
+ std::unique_ptr<WorldmapNS::WorldmapStory> story;
StoryScreenComponent* story_comp;
GUI::SurfaceButton* continue_button;
GUI::SurfaceButton* skip_button;
Modified: trunk/pingus/src/pingus/server.cpp
===================================================================
--- trunk/pingus/src/pingus/server.cpp 2011-08-28 20:59:18 UTC (rev 4189)
+++ trunk/pingus/src/pingus/server.cpp 2011-08-28 21:06:50 UTC (rev 4190)
@@ -36,7 +36,7 @@
return std::string(buffer);
}
-static std::auto_ptr<std::ostream> get_demostream(const PingusLevel& plf)
+static std::unique_ptr<std::ostream> get_demostream(const PingusLevel& plf)
{
std::string flat_levelname = plf.get_resname();
@@ -47,13 +47,13 @@
std::string filename = System::get_userdir() + "demos/" + flat_levelname +
"-" + get_date_string() + ".pingus-demo";
- std::auto_ptr<std::ofstream> out(new std::ofstream(filename.c_str()));
+ std::unique_ptr<std::ofstream> out(new std::ofstream(filename.c_str()));
if (!(*out.get()))
{
std::cout << "DemoRecorder: Error: Couldn't write DemoFile '" << filename
<< "', demo recording will be disabled" << std::endl;
- return std::auto_ptr<std::ostream>();
+ return std::unique_ptr<std::ostream>();
}
else
{
@@ -62,7 +62,7 @@
// Write file header
*out << "(level (name \"" << plf.get_resname() << "\"))\n";
*out << "(checksum \"" << plf.get_checksum() << "\")\n";
- return std::auto_ptr<std::ostream>(out.release());
+ return std::unique_ptr<std::ostream>(out.release());
}
}
Modified: trunk/pingus/src/pingus/server.hpp
===================================================================
--- trunk/pingus/src/pingus/server.hpp 2011-08-28 20:59:18 UTC (rev 4189)
+++ trunk/pingus/src/pingus/server.hpp 2011-08-28 21:06:50 UTC (rev 4190)
@@ -32,13 +32,13 @@
{
protected:
PingusLevel plf;
- std::auto_ptr<World> world;
+ std::unique_ptr<World> world;
/** Manager class for the number of available actions */
ActionHolder action_holder;
- std::auto_ptr<GoalManager> goal_manager;
- std::auto_ptr<std::ostream> demostream;
+ std::unique_ptr<GoalManager> goal_manager;
+ std::unique_ptr<std::ostream> demostream;
public:
Server(const PingusLevel& arg_plf, bool record_demo);
Modified: trunk/pingus/src/pingus/worldmap/worldmap_component.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_component.hpp 2011-08-28
20:59:18 UTC (rev 4189)
+++ trunk/pingus/src/pingus/worldmap/worldmap_component.hpp 2011-08-28
21:06:50 UTC (rev 4190)
@@ -32,7 +32,7 @@
class WorldmapComponent : public GUI::Component
{
private:
- std::auto_ptr<SceneContext> scene_context;
+ std::unique_ptr<SceneContext> scene_context;
WorldmapScreen* worldmap_screen;
public:
Modified: trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2011-08-28
20:59:18 UTC (rev 4189)
+++ trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2011-08-28
21:06:50 UTC (rev 4190)
@@ -246,7 +246,7 @@
void
WorldmapScreen::load (const std::string& filename)
{
- worldmap = std::auto_ptr<Worldmap>(new Worldmap(filename));
+ worldmap = std::unique_ptr<Worldmap>(new Worldmap(filename));
bool credits_unlocked = false;
//StatManager::instance()->get_bool(worldmap->get_short_name() +
"-endstory-seen", credits_unlocked);
@@ -285,7 +285,7 @@
// Check if new worldmap is set and if so, change it
if (new_worldmap.get())
{
- worldmap = new_worldmap;
+ worldmap = std::move(new_worldmap);
}
}
Modified: trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp 2011-08-28
20:59:18 UTC (rev 4189)
+++ trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp 2011-08-28
21:06:50 UTC (rev 4190)
@@ -46,8 +46,8 @@
bool is_init;
bool exit_worldmap;
- std::auto_ptr<Worldmap> worldmap;
- std::auto_ptr<Worldmap> new_worldmap;
+ std::unique_ptr<Worldmap> worldmap;
+ std::unique_ptr<Worldmap> new_worldmap;
GUI::SurfaceButton* close_button;
GUI::SurfaceButton* story_button;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4190 - in trunk/pingus: . external src/engine/display src/engine/input src/engine/screen src/lisp src/pingus src/pingus/components src/pingus/screens src/pingus/worldmap,
grumbel <=