luabind-0.9 への対応を放棄。luabind-0.8.1 の方に揃える
@@ -1,3 +1,10 @@ | ||
1 | +2010/02/12 | |
2 | +---------------------------------------------------------------------- | |
3 | +index.html | |
4 | +"URG ライブラリ 0.8.9" をリリース | |
5 | +Visual Studio で urg.lib に必要なソースコードがビルドされなかったのを修正。 | |
6 | + | |
7 | + | |
1 | 8 | 2010/02/03 |
2 | 9 | ---------------------------------------------------------------------- |
3 | 10 | index.html |
@@ -11,12 +11,11 @@ | ||
11 | 11 | DeviceManager():device("urg"):activate() |
12 | 12 | |
13 | 13 | -- デバイス位置を設定 |
14 | -local run = DeviceManager():device("run") | |
14 | +local run = DeviceManager():model("run") | |
15 | 15 | run:setPosition(Position(0, 0, deg(0)), nil, false) |
16 | 16 | |
17 | -local urg = DeviceManager():device("urg") | |
18 | -local run_model = DeviceManager():model("run") | |
19 | -urg:setPosition(Position(70, 0, deg(0)), run_model, true) | |
17 | +local urg = DeviceManager():model("urg") | |
18 | +urg:setPosition(Position(70, 0, deg(0)), run, true) | |
20 | 19 | |
21 | 20 | |
22 | 21 | -- 障害物を配置 |
@@ -4,7 +4,7 @@ | ||
4 | 4 | |
5 | 5 | |
6 | 6 | -- 利用デバイスの初期化 |
7 | -DeviceManager():createDevice("/dev/usb/ttyUSB0", "BeegoDrive", "run") | |
7 | +DeviceManager():createDevice("/dev/ttyUSB0", "BeegoDrive", "run") | |
8 | 8 | DeviceManager():createDevice("/dev/ttyACM0", "UrgDevice", "urg") |
9 | 9 | |
10 | 10 |
@@ -39,7 +39,7 @@ | ||
39 | 39 | static_cast<void>(argv); |
40 | 40 | |
41 | 41 | mBeegoDrive run; |
42 | - if (! run.connect("/dev/usb/ttyUSB0")) { | |
42 | + if (! run.connect("/dev/ttyUSB0")) { | |
43 | 43 | cout << "BeegoDrive::connect(): " << run.what() << endl; |
44 | 44 | return 1; |
45 | 45 | } |
@@ -14,12 +14,11 @@ | ||
14 | 14 | |
15 | 15 | |
16 | 16 | -- デバイス位置を設定 |
17 | -local run = DeviceManager():device("run") | |
17 | +local run = DeviceManager():model("run") | |
18 | 18 | run:setPosition(Position(0, 0, deg(0)), nil, false) |
19 | 19 | |
20 | -local urg = DeviceManager():device("urg") | |
21 | -local run_model = DeviceManager():model("run") | |
22 | -urg:setPosition3d(Point3d(70, 0, 100), 0.0, 0.0, 1.0, deg(0), run_model, true) | |
20 | +local urg = DeviceManager():model("urg") | |
21 | +urg:setPosition3d(Point3d(70, 0, 100), 0.0, 0.0, 1.0, deg(0), run, true) | |
23 | 22 | |
24 | 23 | |
25 | 24 | -- カメラ視点を設定 |
@@ -14,12 +14,11 @@ | ||
14 | 14 | |
15 | 15 | |
16 | 16 | -- デバイス位置を設定 |
17 | -local run = DeviceManager():device("run") | |
17 | +local run = DeviceManager():model("run") | |
18 | 18 | run:setPosition(Position(0, 0, deg(0)), nil, false) |
19 | 19 | |
20 | -local urg = DeviceManager():device("urg") | |
21 | -local run_model = DeviceManager():model("run") | |
22 | -urg:setPosition(Position(70, 0, deg(0)), run_model, true) | |
20 | +local urg = DeviceManager():model("urg") | |
21 | +urg:setPosition(Position(70, 0, deg(0)), run, true) | |
23 | 22 | |
24 | 23 | |
25 | 24 | -- カメラ視点を設定 |
@@ -14,12 +14,11 @@ | ||
14 | 14 | |
15 | 15 | |
16 | 16 | -- デバイス位置を設定 |
17 | -local run = DeviceManager():device("run") | |
17 | +local run = DeviceManager():model("run") | |
18 | 18 | run:setPosition(Position(0, 0, deg(0)), nil, false) |
19 | 19 | |
20 | -local urg = DeviceManager():device("urg") | |
21 | -local run_model = DeviceManager():model("run") | |
22 | -urg:setPosition3d(Point3d(70, 0, 100), 0.0, 0.0, 1.0, deg(0), run_model, true) | |
20 | +local urg = DeviceManager():model("urg") | |
21 | +urg:setPosition3d(Point3d(70, 0, 100), 0.0, 0.0, 1.0, deg(0), run, true) | |
23 | 22 | |
24 | 23 | |
25 | 24 | -- カメラ視点を設定 |
@@ -140,7 +140,7 @@ | ||
140 | 140 | marker.drawLines("path", follow_points, purple, 30); |
141 | 141 | #endif |
142 | 142 | |
143 | -#if 1 | |
143 | +#if 0 | |
144 | 144 | // 障害物エリアの描画 |
145 | 145 | Color cyan(0.0, 1.0, 1.0); |
146 | 146 | marker.drawPoints("obstacle", obstacle_points, cyan, RobotRadius * 2); |
@@ -7,12 +7,12 @@ | ||
7 | 7 | |
8 | 8 | |
9 | 9 | -- デバイスを作成 |
10 | -local urg_device = DeviceManager():device("urg") | |
11 | -urg_device:activate() | |
10 | +DeviceManager():device("urg"):activate() | |
12 | 11 | |
13 | 12 | |
14 | 13 | -- デバイス位置を設定 |
15 | -urg_device:setPosition(Position(0, 0, deg(0)), nil, false) | |
14 | +local urg = DeviceManager():model("urg") | |
15 | +urg:setPosition(Position(0, 0, deg(0)), nil, false) | |
16 | 16 | |
17 | 17 | |
18 | 18 | -- 障害物を配置 |
@@ -11,9 +11,8 @@ | ||
11 | 11 | |
12 | 12 | |
13 | 13 | -- デバイス位置を設定 |
14 | -local run = DeviceManager():device("run") | |
15 | --- !!! luabind-0.9 では動作しないためコメントアウト中 | |
16 | ---run:setPosition(Position(0, 0, deg(0)), nil, false) | |
14 | +local run = DeviceManager():model("run") | |
15 | +run:setPosition(Position(0, 0, deg(0)), nil, false) | |
17 | 16 | |
18 | 17 | |
19 | 18 | -- 障害物を配置 |
@@ -14,12 +14,11 @@ | ||
14 | 14 | |
15 | 15 | |
16 | 16 | -- デバイス位置を設定 |
17 | -local run = DeviceManager():device("run") | |
17 | +local run = DeviceManager():model("run") | |
18 | 18 | run:setPosition(Position(0, 0, deg(0)), nil, false) |
19 | 19 | |
20 | -local urg = DeviceManager():device("urg") | |
21 | -local run_model = DeviceManager():model("run") | |
22 | -urg:setPosition3d(Point3d(70, 0, 100), 0.0, 0.0, 1.0, deg(0), run_model, true) | |
20 | +local urg = DeviceManager():model("urg") | |
21 | +urg:setPosition3d(Point3d(70, 0, 100), 0.0, 0.0, 1.0, deg(0), run, true) | |
23 | 22 | |
24 | 23 | |
25 | 24 | -- カメラ視点を設定 |
@@ -12,7 +12,7 @@ | ||
12 | 12 | |
13 | 13 | |
14 | 14 | -- デバイス位置を設定 |
15 | -local run = DeviceManager():device("run") | |
15 | +local run = DeviceManager():model("run") | |
16 | 16 | run:setPosition(Position(0, 0, deg(0)), nil, false) |
17 | 17 | |
18 | 18 |
@@ -3,8 +3,8 @@ | ||
3 | 3 | |
4 | 4 | # Compile options |
5 | 5 | CC = $(CXX) |
6 | -#CXXFLAGS = -g -O0 -Wall -W -Werror $(INCLUDES) `sdl-config --cflags` | |
7 | -CXXFLAGS = -g -O0 -Wall -W $(INCLUDES) `sdl-config --cflags` | |
6 | +CXXFLAGS = -g -O0 -Wall -W -Werror $(INCLUDES) `sdl-config --cflags` | |
7 | +#CXXFLAGS = -g -O0 -Wall -W $(INCLUDES) `sdl-config --cflags` | |
8 | 8 | INCLUDES = -I/usr/include/lua5.1 -I.. -I../system -I../gui -I../geometry -I../audio -I../common -I../sync_gui -I../running -I../range_finder -I../coordinate -I../monitoring -I../running/beego_drive -I/usr/include/lua5.1 -I../timestamp -I../math |
9 | 9 | |
10 | 10 | # Target |
@@ -10,12 +10,11 @@ | ||
10 | 10 | DeviceManager():device("urg"):activate() |
11 | 11 | |
12 | 12 | -- デバイス位置を設定 |
13 | -local run = DeviceManager():device("run") | |
13 | +local run = DeviceManager():model("run") | |
14 | 14 | run:setPosition(Position(0, 0, deg(0)), nil, false) |
15 | 15 | |
16 | -local urg = DeviceManager():device("urg") | |
17 | -local run_model = DeviceManager():model("run") | |
18 | -urg:setPosition3d(Point3d(70, 0, 100), 0.0, 0.0, 1.0, deg(0), run_model, true) | |
16 | +local urg = DeviceManager():model("urg") | |
17 | +urg:setPosition3d(Point3d(70, 0, 100), 0.0, 0.0, 1.0, deg(0), run, true) | |
19 | 18 | |
20 | 19 | -- カメラ視点を設定 |
21 | 20 | CameraViewManager():setInitialView(2.0, 0.0, 6.0, deg(0), deg(0), deg(0)) |
@@ -8,5 +8,5 @@ | ||
8 | 8 | DeviceManager():device("run"):activate() |
9 | 9 | |
10 | 10 | -- デバイス位置を設定 |
11 | -local run = DeviceManager():device("run") | |
11 | +local run = DeviceManager():model("run") | |
12 | 12 | run:setPosition(Position(0, 0, deg(0)), nil, false) |
@@ -8,5 +8,5 @@ | ||
8 | 8 | DeviceManager():device("run"):activate() |
9 | 9 | |
10 | 10 | -- デバイス位置を設定 |
11 | -local run = DeviceManager():device("run") | |
11 | +local run = DeviceManager():model("run") | |
12 | 12 | run:setPosition(Position(0, 0, deg(0)), nil, false) |
@@ -8,5 +8,5 @@ | ||
8 | 8 | DeviceManager():device("run"):activate() |
9 | 9 | |
10 | 10 | -- デバイス位置を設定 |
11 | -local run = DeviceManager():device("run") | |
11 | +local run = DeviceManager():model("run") | |
12 | 12 | run:setPosition(Position(0, 0, deg(0)), nil, false) |
@@ -8,5 +8,5 @@ | ||
8 | 8 | DeviceManager():device("run"):activate() |
9 | 9 | |
10 | 10 | -- デバイス位置を設定 |
11 | -local run = DeviceManager():device("run") | |
11 | +local run = DeviceManager():model("run") | |
12 | 12 | run:setPosition(Position(0, 0, deg(0)), nil, false) |
@@ -8,7 +8,7 @@ | ||
8 | 8 | DeviceManager():device("urg"):activate() |
9 | 9 | |
10 | 10 | -- デバイス位置を設定 |
11 | -local urg = DeviceManager():device("urg") | |
11 | +local urg = DeviceManager():model("urg") | |
12 | 12 | urg:setPosition3d(Point3d(0, 0, 0), 0.0, 0.0, 1.0, deg(0), run, true) |
13 | 13 | |
14 | 14 |