projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
camera can move now
[supertux.git]
/
src
/
scripting
/
camera.cpp
diff --git
a/src/scripting/camera.cpp
b/src/scripting/camera.cpp
index
82c5b87
..
d96b5a4
100644
(file)
--- a/
src/scripting/camera.cpp
+++ b/
src/scripting/camera.cpp
@@
-2,13
+2,16
@@
#include <string>
#include <stdio.h>
#include <string>
#include <stdio.h>
-#include "camera.h"
+#include "object/camera.hpp"
+#include "scripting/camera.hpp"
+#include "math/vector.hpp"
#define NOIMPL printf("%s not implemented.\n", __PRETTY_FUNCTION__);
namespace Scripting
{
#define NOIMPL printf("%s not implemented.\n", __PRETTY_FUNCTION__);
namespace Scripting
{
- Camera::Camera()
+ Camera::Camera(::Camera* camera)
+ : camera(camera)
{ }
Camera::~Camera()
{ }
Camera::~Camera()
@@
-30,5
+33,11
@@
namespace Scripting
Camera::set_mode(const std::string& )
{
NOIMPL;
Camera::set_mode(const std::string& )
{
NOIMPL;
- }
+ }
+
+ void
+ Camera::scroll_to(float x, float y, float scrolltime)
+ {
+ camera->scroll_to(Vector(x, y), scrolltime);
+ }
}
}