• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1992 (tree)
日時2012-09-11 14:57:06
作者satofumi

ログメッセージ

add floor

変更サマリ

差分

--- trunk/libs/lua/Makefile (revision 1991)
+++ trunk/libs/lua/Makefile (revision 1992)
@@ -58,7 +58,7 @@
5858 $(CXX) $(CXXFLAGS) `cppunit-config --cflags` $< -c -o $@
5959
6060 TEST_OBJS = allTest.o TestScriptedStateMachine.o $(REQUIRE_LIBS)
61-TEST_LDLIBS = -lluabind
61+TEST_LDLIBS = -lluabind -llua
6262 allTest : $(TEST_OBJS)
6363 $(CXX) $(CXXFLAGS) $(TEST_OBJS) -o $@ `cppunit-config --libs` $(TEST_LDLIBS)
6464
@@ -68,7 +68,8 @@
6868 TestScriptedStateMachine.o: TestScriptedStateMachine.h ScriptedStateMachine.h
6969 lua_runStateMachine.o: lua_runStateMachine.h ScriptedStateMachine.h
7070 lua_runStateMachine.o: LuaHandler.h luabindInit.h ../system/delay.h
71-luabindAudio.o: luabindAudio.h ../audio/SoundEffect.h
71+luabindAudio.o: luabindAudio.h LuaHandler.h ../audio/Audio.h
72+luabindAudio.o: ../audio/BackMusic.h ../audio/SoundEffect.h
7273 luabindBeegoDrive.o: luabindBeegoDrive.h ../monitoring/mBeegoDrive.h
7374 luabindBeegoDrive.o: ../coordinate/Coordinate.h ../geometry/Position.h
7475 luabindBeegoDrive.o: ../geometry/Angle.h ../running/Running.h
--- trunk/libs/range_sensor/c/samples/Makefile (revision 1991)
+++ trunk/libs/range_sensor/c/samples/Makefile (revision 1992)
@@ -104,7 +104,7 @@
104104 md_scan.o: ../urg_ctrl.h ../urg_t.h ../urg_parameter_t.h
105105 md_scan.o: ../../../connection/c/serial_t.h ../../../system/c/detect_os.h
106106 md_scan.o: ../../../connection/c/serial_t_lin.h
107-md_scan.o: ../../../common/c/ring_buffer.h ../../../system/c/urg_delay.h
107+md_scan.o: ../../../common/c/ring_buffer.h
108108 multi_urg.o: ../urg_ctrl.h ../urg_t.h ../urg_parameter_t.h
109109 multi_urg.o: ../../../connection/c/serial_t.h ../../../system/c/detect_os.h
110110 multi_urg.o: ../../../connection/c/serial_t_lin.h
--- trunk/libs/range_sensor/UrgDevice.cpp (revision 1991)
+++ trunk/libs/range_sensor/UrgDevice.cpp (revision 1992)
@@ -19,6 +19,7 @@
1919 #include "Lock.h"
2020 #include <deque>
2121 #include <limits>
22+#include <cmath>
2223 #include <cstring>
2324 #include <cstdio>
2425
@@ -685,8 +686,8 @@
685686 {
686687 int area_total = parameters_.area_total;
687688 int index =
688- static_cast<int>(((radian * area_total) / (2.0 * M_PI)) + 0.5)
689- + parameters_.area_front;
689+ static_cast<int>(floor(((radian * area_total) / (2.0 * M_PI)) + 0.5)
690+ + parameters_.area_front);
690691
691692 if (index < 0) {
692693 index = 0;
--- trunk/libs/range_sensor/ethernet_samples/Makefile (revision 1991)
+++ trunk/libs/range_sensor/ethernet_samples/Makefile (revision 1992)
@@ -33,7 +33,9 @@
3333 # DO NOT DELETE
3434
3535 captureIntensitySample.o: ../UrgDevice.h ../RangeSensor.h
36-captureIntensitySample.o: ../RangeCaptureMode.h ../../coordinate/Coordinate.h
36+captureIntensitySample.o: ../RangeCaptureMode.h ../../math/MathUtils.h
37+captureIntensitySample.o: ../../system/DetectOS.h
38+captureIntensitySample.o: ../../coordinate/Coordinate.h
3739 captureIntensitySample.o: ../../geometry/Position.h ../../geometry/Angle.h
3840 captureIntensitySample.o: ../../connection/TcpipSocket.h
3941 captureIntensitySample.o: ../../connection/Connection.h ../../system/delay.h
--- trunk/libs/network/samples/Makefile (revision 1991)
+++ trunk/libs/network/samples/Makefile (revision 1992)
@@ -7,7 +7,7 @@
77 CXXFLAGS = -g -O0 -Wall -Werror $(INCLUDES) `sdl-config --cflags`
88 INCLUDES = -I/usr/include/lua5.1 -I.. -I../../connection/sdl -I../../connection -I../../system -I../../gui -I../../geometry -I../../lua -I../../common
99 LDFLAGS = -L/usr/X11/lib
10-LDLIBS = `sdl-config --libs` -lSDL_image -lSDL_net -lSDL_ttf -lGL -llua5.1 -lluabind -lboost_signals-mt
10+LDLIBS = `sdl-config --libs` -lSDL_image -lSDL_net -lSDL_ttf -lGL -lluabind -llua5.1 -lboost_signals-mt
1111
1212 # Target
1313 TARGET = \
--- trunk/libs/connection/c/Makefile (revision 1991)
+++ trunk/libs/connection/c/Makefile (revision 1992)
@@ -40,4 +40,12 @@
4040 serial_t_lin.o: ../../common/c/ring_buffer.h
4141 serial_t_win.o: ../../common/c/ring_buffer.h
4242 serial_utils.o: serial_t.h ../../system/c/detect_os.h serial_t_lin.h
43-serial_utils.o: ../../common/c/ring_buffer.h
\ No newline at end of file
43+serial_utils.o: ../../common/c/ring_buffer.h
44+serial_ctrl.o: serial_ctrl.h serial_t.h ../../system/c/detect_os.h
45+serial_ctrl.o: serial_t_lin.h ../../common/c/ring_buffer.h serial_ctrl_lin.c
46+serial_ctrl.o: serial_errno.h
47+serial_ctrl_lin.o: serial_errno.h ../../common/c/ring_buffer.h
48+serial_ctrl_win.o: serial_ctrl.h serial_t.h ../../system/c/detect_os.h
49+serial_ctrl_win.o: serial_t_lin.h ../../common/c/ring_buffer.h serial_errno.h
50+serial_utils.o: serial_utils.h serial_t.h ../../system/c/detect_os.h
51+serial_utils.o: serial_t_lin.h ../../common/c/ring_buffer.h serial_ctrl.h
--- trunk/libs/audio/sdl_mixer/samples/Makefile (revision 1991)
+++ trunk/libs/audio/sdl_mixer/samples/Makefile (revision 1992)
@@ -33,6 +33,7 @@
3333
3434 # DO NOT DELETE
3535
36+BackMusicSample.o: ../../BackMusic.h
3637 SdlMixerSample.o: ../../../system/delay.h
3738 SoundEffectSample.o: ../../Audio.h ../../SoundEffect.h
3839 SoundEffectSample.o: ../../../system/delay.h
--- trunk/libs/audio/sdl_mixer/Makefile (revision 1991)
+++ trunk/libs/audio/sdl_mixer/Makefile (revision 1992)
@@ -33,10 +33,9 @@
3333 # DO NOT DELETE
3434
3535 Audio.o: ../Audio.h SdlMixerInit.h
36-BackMusic.o: ../BackMusic.h
36+BackMusic.o: ../BackMusic.h ../Audio.h
3737 CdPlayer.o: CdPlayer.h SdlCdromInit.h
3838 SdlAudioInit.o: ../../system/sdl/SdlInit.h SdlAudioInit.h
3939 SdlCdromInit.o: ../../system/sdl/SdlInit.h SdlCdromInit.h
4040 SdlMixerInit.o: SdlAudioInit.h SdlMixerInit.h
4141 SoundEffect.o: ../SoundEffect.h ../Audio.h
42-Volume.o: ../Volume.h
--- trunk/libs/audio/open_al/Makefile (revision 1991)
+++ trunk/libs/audio/open_al/Makefile (revision 1992)
@@ -29,4 +29,3 @@
2929
3030 Audio.o: ../Audio.h
3131 SoundEffect.o: ../SoundEffect.h ../Audio.h ../../system/log_printf.h
32-Volume.o: ../Volume.h
旧リポジトリブラウザで表示