Revision f150aab5

View differences:

.clang-format
1
---
2
BasedOnStyle:  Google
3
ColumnLimit:    125
4
MaxEmptyLinesToKeep: 1
5
SortIncludes: false
6

  
7
Standard:        Auto
8
IndentWidth:     3
9
TabWidth:        3
10
UseTab:          ForIndentation
11
AccessModifierOffset: -3
12
ConstructorInitializerIndentWidth: 3
13
NamespaceIndentation: None
14
ContinuationIndentWidth: 3
15
IndentCaseLabels: true
16
IndentFunctionDeclarationAfterType: false
17

  
18
AlignEscapedNewlinesLeft: false
19
AlignTrailingComments: true
20

  
21
AllowAllParametersOfDeclarationOnNextLine: false
22
ExperimentalAutoDetectBinPacking: false
23
ObjCSpaceBeforeProtocolList: true
24
Cpp11BracedListStyle: false
25

  
26
AllowShortBlocksOnASingleLine: true
27
AllowShortIfStatementsOnASingleLine: false
28
AllowShortLoopsOnASingleLine: false
29
AllowShortFunctionsOnASingleLine: None
30
AllowShortCaseLabelsOnASingleLine: false
31

  
32
AlwaysBreakTemplateDeclarations: true
33
AlwaysBreakBeforeMultilineStrings: false
34
BreakBeforeBinaryOperators: false
35
BreakBeforeTernaryOperators: false
36
BreakConstructorInitializersBeforeComma: true
37

  
38
BinPackParameters: true
39
ConstructorInitializerAllOnOneLineOrOnePerLine: true
40
DerivePointerBinding: false
41
PointerBindsToType: true
42

  
43
PenaltyExcessCharacter: 50
44
PenaltyBreakBeforeFirstCallParameter: 30
45
PenaltyBreakComment: 1000
46
PenaltyBreakFirstLessLess: 10
47
PenaltyBreakString: 100
48
PenaltyReturnTypeOnItsOwnLine: 50
49

  
50
SpacesBeforeTrailingComments: 1
51
SpacesInParentheses: false
52
SpacesInAngles:  false
53
SpaceInEmptyParentheses: false
54
SpacesInCStyleCastParentheses: false
55
SpaceAfterCStyleCast: false
56
SpaceAfterControlStatementKeyword: true
57
SpaceBeforeAssignmentOperators: true
58

  
59
# Configure each individual brace in BraceWrapping
60
BreakBeforeBraces: Custom
61

  
62
# Control of individual brace wrapping cases
63
BraceWrapping:
64
    AfterCaseLabel: true
65
    AfterClass: false
66
    AfterControlStatement: false
67
    AfterEnum: true
68
    AfterFunction: false
69
    AfterNamespace: false
70
    AfterStruct: false
71
    AfterUnion: false
72
    BeforeCatch: true
73
    BeforeElse: true
74
    IndentBraces: false
75
...
client/cpp/examples/random_gaze/main.cpp
1 1
/*
2
* This file is part of hlrc_client
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc_server
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc_client
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc_server
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#include "RobotController.h"
30 30
#include "RobotGaze.h"
31 31
#include <unistd.h>
32 32

  
33
float rand_float(float min, float max){
34
    float f = (float)rand() / RAND_MAX;
35
    return min + f * (max - min);
33
float rand_float(float min, float max) {
34
	float f = (float)rand() / RAND_MAX;
35
	return min + f * (max - min);
36 36
}
37 37

  
38
int main (int argc, char **argv){
39
    if (argc != 3){
40
        printf("usage: %s <middleware> <robot scope>\n", argv[0]);
41
        printf("       <middleware> is either ROS or RSB\n");
42
	printf("       <robot scope> e.g. /flobi or /icub\n\n");
43
        exit(EXIT_FAILURE);
44
    }
38
int main(int argc, char** argv) {
39
	if (argc != 3) {
40
		printf("usage: %s <middleware> <robot scope>\n", argv[0]);
41
		printf("       <middleware> is either ROS or RSB\n");
42
		printf("       <robot scope> e.g. /flobi or /icub\n\n");
43
		exit(EXIT_FAILURE);
44
	}
45 45

  
46
    RobotController *robot_controller = new RobotController(argv[1], argv[2]); //"/flobi");
47
    //robot_controller->set_current_emotion(RobotEmotion(RobotEmotion::NEUTRAL));
48
    RobotGaze gaze;
46
	RobotController* robot_controller = new RobotController(argv[1], argv[2]); //"/flobi");
47
	// robot_controller->set_current_emotion(RobotEmotion(RobotEmotion::NEUTRAL));
48
	RobotGaze gaze;
49 49

  
50
    int count=0;
50
	int count = 0;
51 51

  
52
    while(1){
53
        if (count++ >= 50){
54
			//a new target every second:
55
			gaze.pan  = rand_float(-20.0, 20.0);
52
	while (1) {
53
		if (count++ >= 50) {
54
			// a new target every second:
55
			gaze.pan = rand_float(-20.0, 20.0);
56 56
			gaze.tilt = rand_float(-20.0, 20.0);
57 57
			gaze.roll = 0.0;
58 58
			gaze.vergence = 0.0;
59 59

  
60
            //absolute mode
61
            gaze.gaze_type      = RobotGaze::ABSOLUTE;
62
            gaze.gaze_timestamp = RobotTimestamp::now();
60
			// absolute mode
61
			gaze.gaze_type = RobotGaze::ABSOLUTE;
62
			gaze.gaze_timestamp = RobotTimestamp::now();
63 63

  
64
            //robot_controller->set_current_emotion(RobotEmotion(RobotEmotion::ANGRY));
64
			// robot_controller->set_current_emotion(RobotEmotion(RobotEmotion::ANGRY));
65 65

  
66
			//reset counter
66
			// reset counter
67 67
			count = 0;
68 68
		}
69 69

  
70
        robot_controller->set_gaze_target(gaze);
71
		usleep(1000/50 * 1000 );
72
    }	
73

  
70
		robot_controller->set_gaze_target(gaze);
71
		usleep(1000 / 50 * 1000);
72
	}
74 73
}
client/cpp/examples/speech_test/main.cpp
1 1
/*
2
* This file is part of hlrc_client
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc_server
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc_client
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc_server
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#include "RobotController.h"
30 30
#include <unistd.h>
31 31

  
32 32
#define BLOCKING true
33 33

  
34
int main (int argc, char **argv){
35
    RobotController *robot_controller = new RobotController("RSB", "/flobi");
34
int main(int argc, char** argv) {
35
	RobotController* robot_controller = new RobotController("RSB", "/flobi");
36 36

  
37
    int count=0;
37
	int count = 0;
38 38

  
39
    printf("> speech test starting.\n");
40

  
41
    robot_controller->set_speak("i will start counting now.\n", BLOCKING);
42
    while(1){
43
        std::string text = std::to_string(count++);
44
        printf("> saying '%s'\n",text.c_str());
45
        robot_controller->set_speak(text, BLOCKING);
46
        sleep(1);
47
    }
39
	printf("> speech test starting.\n");
48 40

  
41
	robot_controller->set_speak("i will start counting now.\n", BLOCKING);
42
	while (1) {
43
		std::string text = std::to_string(count++);
44
		printf("> saying '%s'\n", text.c_str());
45
		robot_controller->set_speak(text, BLOCKING);
46
		sleep(1);
47
	}
49 48
}
client/cpp/include/Middleware.h
1 1
/*
2
* This file is part of hlrc
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28
#pragma once
29 29

  
30 30
//*********************************************************************************
31
//allow direct synthesis using inprotk calls. by default this is disabled
32
//until inprotk gets to an usable state (e.g. the completion flag has to work)
31
// allow direct synthesis using inprotk calls. by default this is disabled
32
// until inprotk gets to an usable state (e.g. the completion flag has to work)
33 33
#define USE_INPROTK_SYNTHESIS 0
34 34
//*********************************************************************************
35 35

  
......
39 39
#include "RobotGaze.h"
40 40
#include "RobotMouth.h"
41 41

  
42
class Middleware{
42
class Middleware {
43 43
public:
44
    Middleware(std::string scope);
44
	Middleware(std::string scope);
45 45

  
46
    void set_default_emotion(RobotEmotion e, bool blocking);
47
    void set_current_emotion(RobotEmotion e, bool blocking);
48
    void set_gaze_target(RobotGaze target, bool blocking);
49
    void set_lookat_target(float x, float y, float z, const std::string frame_id,
50
                           bool blocking, float roll);
51
    void set_mouth_target(RobotMouth target, bool blocking);
52
    void set_head_animation(RobotHeadAnimation a, bool blocking);
53
    void set_speak(std::string text, bool blocking);
46
	void set_default_emotion(RobotEmotion e, bool blocking);
47
	void set_current_emotion(RobotEmotion e, bool blocking);
48
	void set_gaze_target(RobotGaze target, bool blocking);
49
	void set_lookat_target(float x, float y, float z, const std::string frame_id, bool blocking, float roll);
50
	void set_mouth_target(RobotMouth target, bool blocking);
51
	void set_head_animation(RobotHeadAnimation a, bool blocking);
52
	void set_speak(std::string text, bool blocking);
54 53

  
55
    RobotEmotion get_current_emotion();
56
    RobotEmotion get_default_emotion();
57
    RobotGaze get_gaze_target();
54
	RobotEmotion get_current_emotion();
55
	RobotEmotion get_default_emotion();
56
	RobotGaze get_gaze_target();
58 57

  
59 58
protected:
60
    virtual void init() = 0;
61
    virtual void publish_default_emotion(RobotEmotion e, bool blocking) = 0;
62
    virtual void publish_current_emotion(RobotEmotion e, bool blocking) = 0;
63
    virtual void publish_gaze_target(RobotGaze g, bool blocking) = 0;
64
    virtual void publish_lookat_target(float x, float y, float z, const std::string frame_id,
65
                                       bool blocking, float roll) = 0;
66
    virtual void publish_mouth_target(RobotMouth m, bool blocking) = 0;
67
    virtual void publish_head_animation(RobotHeadAnimation a, bool blocking) = 0;
68
    virtual void publish_speech(std::string text, bool blocking) = 0;
59
	virtual void init() = 0;
60
	virtual void publish_default_emotion(RobotEmotion e, bool blocking) = 0;
61
	virtual void publish_current_emotion(RobotEmotion e, bool blocking) = 0;
62
	virtual void publish_gaze_target(RobotGaze g, bool blocking) = 0;
63
	virtual void publish_lookat_target(float x, float y, float z, const std::string frame_id, bool blocking, float roll) = 0;
64
	virtual void publish_mouth_target(RobotMouth m, bool blocking) = 0;
65
	virtual void publish_head_animation(RobotHeadAnimation a, bool blocking) = 0;
66
	virtual void publish_speech(std::string text, bool blocking) = 0;
69 67

  
70
    std::string base_scope;
68
	std::string base_scope;
71 69

  
72 70
private:
73
    RobotEmotion defaultEmotion;
74
    RobotEmotion currentEmotion;
71
	RobotEmotion defaultEmotion;
72
	RobotEmotion currentEmotion;
75 73

  
76
    RobotGaze gazeTarget;
77
    RobotMouth mouthTarget;
74
	RobotGaze gazeTarget;
75
	RobotMouth mouthTarget;
78 76

  
79
    RobotHeadAnimation headAnimation;
77
	RobotHeadAnimation headAnimation;
80 78
};
81

  
82

  
client/cpp/include/MiddlewareROS.h
1 1
/*
2
* This file is part of hlrc
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#pragma once
30 30

  
31 31
#include "Middleware.h"
32 32
#if ROS_SUPPORT
33
    #include "ros/ros.h"
34
    //ros messages
35
    #include <hlrc_server/phoneme.h>
36
    #include <hlrc_server/soundchunk.h>
37
    #include <hlrc_server/gazetargetAction.h>
38
    #include <hlrc_server/lookattargetAction.h>
39
    #include <hlrc_server/animationAction.h>
40
    #include <hlrc_server/mouthtargetAction.h>
41
    #include <hlrc_server/utteranceAction.h>
42
    #include <hlrc_server/emotionstateAction.h>
43
    #include <hlrc_server/speechAction.h>
44
    #include <actionlib/client/simple_action_client.h>
45
    #include <actionlib/client/terminal_state.h>
46
    #include <boost/shared_ptr.hpp>
33
#include "ros/ros.h"
34
// ros messages
35
#include <hlrc_server/phoneme.h>
36
#include <hlrc_server/soundchunk.h>
37
#include <hlrc_server/gazetargetAction.h>
38
#include <hlrc_server/lookattargetAction.h>
39
#include <hlrc_server/animationAction.h>
40
#include <hlrc_server/mouthtargetAction.h>
41
#include <hlrc_server/utteranceAction.h>
42
#include <hlrc_server/emotionstateAction.h>
43
#include <hlrc_server/speechAction.h>
44
#include <actionlib/client/simple_action_client.h>
45
#include <actionlib/client/terminal_state.h>
46
#include <boost/shared_ptr.hpp>
47 47
#endif
48 48

  
49 49
#define ROS_ACTION_CALL_TIMEOUT 30.0
50 50

  
51
class MiddlewareROS : public Middleware{
51
class MiddlewareROS : public Middleware {
52 52
#ifndef ROS_SUPPORT
53 53
public:
54
    MiddlewareROS(std::string scope) : Middleware(scope){
55
        printf("> ERROR: hlrc was compiled without ROS middleware support. Please use MiddlewareRSB() instead!\n\n");
56
        exit(EXIT_FAILURE);
57
    }
54
	MiddlewareROS(std::string scope) : Middleware(scope) {
55
		printf("> ERROR: hlrc was compiled without ROS middleware support. Please use MiddlewareRSB() instead!\n\n");
56
		exit(EXIT_FAILURE);
57
	}
58 58

  
59
    void init(){};
60
    void publish_default_emotion(RobotEmotion e, bool blocking){};
61
    void publish_current_emotion(RobotEmotion e, bool blocking){};
62
    void publish_gaze_target(RobotGaze g, bool blocking){};
63
    void publish_lookat_target(float x, float y, float z, const std::string frame_id,
64
                               bool blocking, float roll){};
65
    void publish_mouth_target(RobotMouth m, bool blocking){};
66
    void publish_head_animation(RobotHeadAnimation a, bool blocking) {};
67
    void publish_speech(std::string text, bool blocking) {};
59
	void init(){};
60
	void publish_default_emotion(RobotEmotion e, bool blocking){};
61
	void publish_current_emotion(RobotEmotion e, bool blocking){};
62
	void publish_gaze_target(RobotGaze g, bool blocking){};
63
	void publish_lookat_target(float x, float y, float z, const std::string frame_id, bool blocking, float roll){};
64
	void publish_mouth_target(RobotMouth m, bool blocking){};
65
	void publish_head_animation(RobotHeadAnimation a, bool blocking){};
66
	void publish_speech(std::string text, bool blocking){};
68 67

  
69 68
#else
70 69
public:
71
    MiddlewareROS(std::string scope);
70
	MiddlewareROS(std::string scope);
72 71

  
73 72
protected:
74
    void init();
75
    void publish_current_emotion(RobotEmotion e, bool blocking);
76
    void publish_default_emotion(RobotEmotion e, bool blocking);
77
    void publish_gaze_target(RobotGaze target, bool blocking);
78
    void publish_lookat_target(float x, float y, float z, const std::string frame_id,
79
                               bool blocking, float roll);
80
    void publish_mouth_target(RobotMouth target, bool blocking);
81
    void publish_head_animation(RobotHeadAnimation a, bool blocking);
82
    void publish_speech(std::string text, bool blocking);
73
	void init();
74
	void publish_current_emotion(RobotEmotion e, bool blocking);
75
	void publish_default_emotion(RobotEmotion e, bool blocking);
76
	void publish_gaze_target(RobotGaze target, bool blocking);
77
	void publish_lookat_target(float x, float y, float z, const std::string frame_id, bool blocking, float roll);
78
	void publish_mouth_target(RobotMouth target, bool blocking);
79
	void publish_head_animation(RobotHeadAnimation a, bool blocking);
80
	void publish_speech(std::string text, bool blocking);
83 81

  
84 82
private:
85
    void publish_emotion(std::string scope_target, RobotEmotion e, bool blocking);
86
    void check_service(ros::ServiceClient *service);
83
	void publish_emotion(std::string scope_target, RobotEmotion e, bool blocking);
84
	void check_service(ros::ServiceClient* service);
87 85

  
88
    actionlib::SimpleActionClient<hlrc_server::animationAction>     *animation_ac;
89
    actionlib::SimpleActionClient<hlrc_server::utteranceAction>     *utterance_ac;
90
    actionlib::SimpleActionClient<hlrc_server::emotionstateAction>  *default_emotionstate_ac;
91
    actionlib::SimpleActionClient<hlrc_server::emotionstateAction>  *current_emotionstate_ac;
92
    actionlib::SimpleActionClient<hlrc_server::gazetargetAction>    *gazetarget_ac;
93
    actionlib::SimpleActionClient<hlrc_server::lookattargetAction>  *lookattarget_ac;
94
    actionlib::SimpleActionClient<hlrc_server::mouthtargetAction>   *mouthtarget_ac;
95
    actionlib::SimpleActionClient<hlrc_server::speechAction>        *speech_ac;
86
	actionlib::SimpleActionClient<hlrc_server::animationAction>* animation_ac;
87
	actionlib::SimpleActionClient<hlrc_server::utteranceAction>* utterance_ac;
88
	actionlib::SimpleActionClient<hlrc_server::emotionstateAction>* default_emotionstate_ac;
89
	actionlib::SimpleActionClient<hlrc_server::emotionstateAction>* current_emotionstate_ac;
90
	actionlib::SimpleActionClient<hlrc_server::gazetargetAction>* gazetarget_ac;
91
	actionlib::SimpleActionClient<hlrc_server::lookattargetAction>* lookattarget_ac;
92
	actionlib::SimpleActionClient<hlrc_server::mouthtargetAction>* mouthtarget_ac;
93
	actionlib::SimpleActionClient<hlrc_server::speechAction>* speech_ac;
96 94
#endif
97 95
};
client/cpp/include/MiddlewareRSB.h
1 1
/*
2
* This file is part of hlrc
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#pragma once
30 30
#include "Middleware.h"
31 31
#ifdef RSB_SUPPORT
32
    #define BOOST_SIGNALS_NO_DEPRECATION_WARNING //mute warnings from RSB
33
    #include <rsb/Factory.h>
34
    #include <rsb/Informer.h>
35
    #include <rsb/Listener.h>
32
#define BOOST_SIGNALS_NO_DEPRECATION_WARNING // mute warnings from RSB
33
#include <rsb/Factory.h>
34
#include <rsb/Informer.h>
35
#include <rsb/Listener.h>
36 36

  
37
    #if USE_INPROTK_SYNTHESIS
38
    #include <rst/communicationpatterns/TaskState.pb.h>
39
    #endif
37
#if USE_INPROTK_SYNTHESIS
38
#include <rst/communicationpatterns/TaskState.pb.h>
39
#endif
40 40
#endif
41 41

  
42
class MiddlewareRSB : public Middleware{
42
class MiddlewareRSB : public Middleware {
43 43
#ifndef RSB_SUPPORT
44 44
public:
45
    MiddlewareRSB(std::string scope) : Middleware(scope){
46
        printf("> ERROR: hlrc was compiled without RSB middleware support. Please use MiddlewareROS() instead!\n\n");
47
        exit(EXIT_FAILURE);
48
    }
49

  
50
    void init(){};
51
    void publish_default_emotion(RobotEmotion e, bool blocking){};
52
    void publish_current_emotion(RobotEmotion e, bool blocking){};
53
    void publish_gaze_target(RobotGaze g, bool blocking){};
54
    void publish_lookat_target(float x, float y, float z, const std::string frame_id,
55
                               bool blocking, float roll){};
56
    void publish_mouth_target(RobotMouth m, bool blocking){};
57
    void publish_head_animation(RobotHeadAnimation a, bool blocking) {};
58
    void publish_speech(std::string text, bool blocking) {};
45
	MiddlewareRSB(std::string scope) : Middleware(scope) {
46
		printf("> ERROR: hlrc was compiled without RSB middleware support. Please use MiddlewareROS() instead!\n\n");
47
		exit(EXIT_FAILURE);
48
	}
59 49

  
50
	void init(){};
51
	void publish_default_emotion(RobotEmotion e, bool blocking){};
52
	void publish_current_emotion(RobotEmotion e, bool blocking){};
53
	void publish_gaze_target(RobotGaze g, bool blocking){};
54
	void publish_lookat_target(float x, float y, float z, const std::string frame_id, bool blocking, float roll){};
55
	void publish_mouth_target(RobotMouth m, bool blocking){};
56
	void publish_head_animation(RobotHeadAnimation a, bool blocking){};
57
	void publish_speech(std::string text, bool blocking){};
60 58

  
61 59
#else
62 60
public:
63
    MiddlewareRSB(std::string scope);
64

  
61
	MiddlewareRSB(std::string scope);
65 62

  
66 63
protected:
67
    void init();
68
    void publish_current_emotion(RobotEmotion e, bool blocking);
69
    void publish_default_emotion(RobotEmotion e, bool blocking);
70
    void publish_gaze_target(RobotGaze target, bool blocking);
71
    void publish_lookat_target(float x, float y, float z, const std::string frame_id,
72
                               bool blocking, float roll);
73
    void publish_mouth_target(RobotMouth target, bool blocking);
74
    void publish_head_animation(RobotHeadAnimation a, bool blocking);
75
    void publish_speech(std::string text, bool blocking);
64
	void init();
65
	void publish_current_emotion(RobotEmotion e, bool blocking);
66
	void publish_default_emotion(RobotEmotion e, bool blocking);
67
	void publish_gaze_target(RobotGaze target, bool blocking);
68
	void publish_lookat_target(float x, float y, float z, const std::string frame_id, bool blocking, float roll);
69
	void publish_mouth_target(RobotMouth target, bool blocking);
70
	void publish_head_animation(RobotHeadAnimation a, bool blocking);
71
	void publish_speech(std::string text, bool blocking);
76 72

  
77 73
private:
78
    void publish_emotion(std::string scope_target, RobotEmotion e, bool blocking);
74
	void publish_emotion(std::string scope_target, RobotEmotion e, bool blocking);
79 75

  
80
    //rsb::patterns::RemoteServerPtr inprotk_server;
81
    rsb::patterns::RemoteServerPtr hlrc_server;
82
    //rsb::patterns::LocalServerPtr inprotk_server;
76
	// rsb::patterns::RemoteServerPtr inprotk_server;
77
	rsb::patterns::RemoteServerPtr hlrc_server;
78
	// rsb::patterns::LocalServerPtr inprotk_server;
83 79
#if USE_INPROTK_SYNTHESIS
84
    rsb::Informer<rst::communicationpatterns::TaskState>::Ptr inprotk_informer;
85
    rsb::ListenerPtr inprotk_listener;
86
    rsb::ListenerPtr hack_listener;
80
	rsb::Informer<rst::communicationpatterns::TaskState>::Ptr inprotk_informer;
81
	rsb::ListenerPtr inprotk_listener;
82
	rsb::ListenerPtr hack_listener;
87 83

  
88
    boost::mutex pending_tasks_mutex;
89
    std::vector<boost::shared_ptr<rst::communicationpatterns::TaskState>> pending_tasks;
90
    unsigned int say_task_active;
91
    unsigned int say_task_done;
84
	boost::mutex pending_tasks_mutex;
85
	std::vector<boost::shared_ptr<rst::communicationpatterns::TaskState> > pending_tasks;
86
	unsigned int say_task_active;
87
	unsigned int say_task_done;
92 88

  
93
    boost::mutex current_saytask_mutex;
94
    std::string current_saytask;
95
    std::string get_current_saytask();
96
    void set_current_saytask(std::string text);
89
	boost::mutex current_saytask_mutex;
90
	std::string current_saytask;
91
	std::string get_current_saytask();
92
	void set_current_saytask(std::string text);
97 93

  
98
    void check_for_inprotk();
99
    void incoming_hack(boost::shared_ptr<std::string> finished_task);
94
	void check_for_inprotk();
95
	void incoming_hack(boost::shared_ptr<std::string> finished_task);
100 96
#endif
101 97
#endif
102 98
};
103

  
client/cpp/include/RobotController.h
1 1
/*
2
* This file is part of hlrc
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#pragma once
30 30
#include <string>
......
35 35

  
36 36
class Middleware;
37 37

  
38
class RobotController{
38
class RobotController {
39 39
public:
40
    RobotController(std::string middleware, std::string scope);
40
	RobotController(std::string middleware, std::string scope);
41 41

  
42
    void set_default_emotion(RobotEmotion e, bool blocking=false);
43
    void set_current_emotion(RobotEmotion e, bool blocking=false);
42
	void set_default_emotion(RobotEmotion e, bool blocking = false);
43
	void set_current_emotion(RobotEmotion e, bool blocking = false);
44 44

  
45
    void set_gaze_target(RobotGaze target, bool blocking=false);
46
    RobotGaze get_gaze_target();
47
    void set_lookat_target(float x, float y, float z, const std::string frame_id="",
48
                           bool blocking=false, float roll=0.0);
45
	void set_gaze_target(RobotGaze target, bool blocking = false);
46
	RobotGaze get_gaze_target();
47
	void set_lookat_target(float x, float y, float z, const std::string frame_id = "", bool blocking = false,
48
	                       float roll = 0.0);
49 49

  
50
    void set_mouth_target(RobotMouth target, bool blocking=false);
50
	void set_mouth_target(RobotMouth target, bool blocking = false);
51 51

  
52
    void set_head_animation(RobotHeadAnimation a, bool blocking=false);
53
    void set_speak(std::string text, bool blocking=false);
52
	void set_head_animation(RobotHeadAnimation a, bool blocking = false);
53
	void set_speak(std::string text, bool blocking = false);
54 54

  
55 55
private:
56
    Middleware *middleware;
57

  
56
	Middleware* middleware;
58 57
};
59

  
60

  
client/cpp/include/RobotEmotion.h
1 1
/*
2
* This file is part of hlrc
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#pragma once
30 30

  
31
class RobotEmotion{
31
class RobotEmotion {
32 32
public:
33
    RobotEmotion(int v=NEUTRAL){
34
        value = v;
35
        time_ms = 1000;
36
    }
33
	RobotEmotion(int v = NEUTRAL) {
34
		value = v;
35
		time_ms = 1000;
36
	}
37 37

  
38
    int value;
39
    static const int NEUTRAL   = 0;
40
    static const int HAPPY     = 1;
41
    static const int SAD       = 2;
42
    static const int ANGRY     = 3;
43
    static const int SURPRISED = 4;
44
    static const int FEAR      = 5;
45
    int time_ms;
38
	int value;
39
	static const int NEUTRAL = 0;
40
	static const int HAPPY = 1;
41
	static const int SAD = 2;
42
	static const int ANGRY = 3;
43
	static const int SURPRISED = 4;
44
	static const int FEAR = 5;
45
	int time_ms;
46 46
};
47

  
client/cpp/include/RobotGaze.h
1 1
/*
2
* This file is part of hlrc
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#pragma once
30 30
#include <time.h>
31 31
#include "RobotTimestamp.h"
32 32

  
33
class RobotGaze{
33
class RobotGaze {
34 34
public:
35
    RobotGaze() : gaze_timestamp() {
36
        pan = 0.0;
37
        tilt = 0.0;
38
        roll = 0.0;
39
        vergence = 0.0;
40
        pan_offset = 0.0;
41
        tilt_offset = 0.0;
42
        gaze_type = ABSOLUTE;
43
    }
35
	RobotGaze() : gaze_timestamp() {
36
		pan = 0.0;
37
		tilt = 0.0;
38
		roll = 0.0;
39
		vergence = 0.0;
40
		pan_offset = 0.0;
41
		tilt_offset = 0.0;
42
		gaze_type = ABSOLUTE;
43
	}
44 44

  
45
    /*static double now(){
46
        //fetch time
47
        struct timespec tp;
48
        clock_gettime(CLOCK_REALTIME, &tp);
49
        return tp.tv_sec+tp.tv_nsec/1000000000.0;
50
    };*/
45
	/*static double now(){
46
	    //fetch time
47
	    struct timespec tp;
48
	    clock_gettime(CLOCK_REALTIME, &tp);
49
	    return tp.tv_sec+tp.tv_nsec/1000000000.0;
50
	};*/
51 51

  
52
    enum {
53
        RELATIVE = 0,
54
        ABSOLUTE = 1
55
    };
52
	enum
53
	{
54
		RELATIVE = 0,
55
		ABSOLUTE = 1
56
	};
56 57

  
57
    RobotTimestamp gaze_timestamp;
58
    int gaze_type;
58
	RobotTimestamp gaze_timestamp;
59
	int gaze_type;
59 60

  
60
    float pan, tilt, roll, vergence;
61
    float pan_offset, tilt_offset;
61
	float pan, tilt, roll, vergence;
62
	float pan_offset, tilt_offset;
62 63
};
63

  
client/cpp/include/RobotHeadAnimation.h
1 1
/*
2
* This file is part of hlrc
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#pragma once
30
class RobotHeadAnimation{
30
class RobotHeadAnimation {
31 31
public:
32
    RobotHeadAnimation(int v=IDLE){
33
        value = v;
34
        time_ms = 1000;
35
        repetitions = 1;
36
        scale = 1.0;
37
    }
32
	RobotHeadAnimation(int v = IDLE) {
33
		value = v;
34
		time_ms = 1000;
35
		repetitions = 1;
36
		scale = 1.0;
37
	}
38 38

  
39
    int value;
40
    static const int IDLE            = 0;
41
    static const int HEAD_NOD        = 1;
42
    static const int HEAD_SHAKE      = 2;
43
    static const int EYEBLINK_L      = 3;
44
    static const int EYEBLINK_R      = 4;
45
    static const int EYEBLINK_BOTH   = 5;
46
    static const int EYEBROWS_RAISE  = 6;
47
    static const int EYEBROWS_LOWER  = 7;
48
    static const int ENGAGEMENT_LEFT = 8;
49
    static const int ENGAGEMENT_RIGHT = 9;
50

  
51
    int time_ms;
52
    int repetitions;
53
    float scale;
39
	int value;
40
	static const int IDLE = 0;
41
	static const int HEAD_NOD = 1;
42
	static const int HEAD_SHAKE = 2;
43
	static const int EYEBLINK_L = 3;
44
	static const int EYEBLINK_R = 4;
45
	static const int EYEBLINK_BOTH = 5;
46
	static const int EYEBROWS_RAISE = 6;
47
	static const int EYEBROWS_LOWER = 7;
48
	static const int ENGAGEMENT_LEFT = 8;
49
	static const int ENGAGEMENT_RIGHT = 9;
54 50

  
51
	int time_ms;
52
	int repetitions;
53
	float scale;
55 54
};
56

  
client/cpp/include/RobotMouth.h
1 1
/*
2
* This file is part of hlrc
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#pragma once
30
class RobotMouth{
30
class RobotMouth {
31 31
public:
32
    RobotMouth(){
33
        opening_left   = 0.0;
34
        opening_center = 0.0;
35
        opening_right  = 0.0;
36
        position_left  = 0.0;
37
        position_center = 0.0;
38
        position_right = 0.0;
39
    }
32
	RobotMouth() {
33
		opening_left = 0.0;
34
		opening_center = 0.0;
35
		opening_right = 0.0;
36
		position_left = 0.0;
37
		position_center = 0.0;
38
		position_right = 0.0;
39
	}
40 40

  
41
    float opening_left, opening_right, opening_center;
42
    float position_left, position_right, position_center;
41
	float opening_left, opening_right, opening_center;
42
	float position_left, position_right, position_center;
43 43
};
44

  
client/cpp/include/RobotTimestamp.h
1 1
/*
2
* This file is part of hlrc
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#pragma once
30 30
#include <time.h>
......
32 32

  
33 33
class RobotTimestamp {
34 34
public:
35
    RobotTimestamp(){
36
        RobotTimestamp n = now();
37
        sec = n.sec;
38
        nsec = n.nsec;
39
    }
35
	RobotTimestamp() {
36
		RobotTimestamp n = now();
37
		sec = n.sec;
38
		nsec = n.nsec;
39
	}
40 40

  
41
    RobotTimestamp(int32_t _sec, int32_t _nsec) {
42
        sec = _sec;
43
        nsec = _nsec;
44
    }
41
	RobotTimestamp(int32_t _sec, int32_t _nsec) {
42
		sec = _sec;
43
		nsec = _nsec;
44
	}
45 45

  
46
    static RobotTimestamp now(){
47
        // fetch time
48
        struct timespec tp;
49
        clock_gettime(CLOCK_REALTIME, &tp);
46
	static RobotTimestamp now() {
47
		// fetch time
48
		struct timespec tp;
49
		clock_gettime(CLOCK_REALTIME, &tp);
50 50

  
51
        return RobotTimestamp(tp.tv_sec, tp.tv_nsec);
52
    };
51
		return RobotTimestamp(tp.tv_sec, tp.tv_nsec);
52
	};
53 53

  
54
    int32_t sec;
55
    int32_t nsec;
54
	int32_t sec;
55
	int32_t nsec;
56 56
};
57

  
client/cpp/src/Middleware.cpp
1 1
/*
2
* This file is part of hlrc
3
*
4
* Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
* http://opensource.cit-ec.de/projects/hlrc
6
*
7
* This file may be licensed under the terms of the
8
* GNU General Public License Version 3 (the ``GPL''),
9
* or (at your option) any later version.
10
*
11
* Software distributed under the License is distributed
12
* on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
* express or implied. See the GPL for the specific language
14
* governing rights and limitations.
15
*
16
* You should have received a copy of the GPL along with this
17
* program. If not, go to http://www.gnu.org/licenses/gpl.html
18
* or write to the Free Software Foundation, Inc.,
19
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
*
21
* The development of this software was supported by the
22
* Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
* The Excellence Cluster EXC 277 is a grant of the Deutsche
24
* Forschungsgemeinschaft (DFG) in the context of the German
25
* Excellence Initiative.
26
*
27
*/
2
 * This file is part of hlrc
3
 *
4
 * Copyright(c) sschulz <AT> techfak.uni-bielefeld.de
5
 * http://opensource.cit-ec.de/projects/hlrc
6
 *
7
 * This file may be licensed under the terms of the
8
 * GNU General Public License Version 3 (the ``GPL''),
9
 * or (at your option) any later version.
10
 *
11
 * Software distributed under the License is distributed
12
 * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
13
 * express or implied. See the GPL for the specific language
14
 * governing rights and limitations.
15
 *
16
 * You should have received a copy of the GPL along with this
17
 * program. If not, go to http://www.gnu.org/licenses/gpl.html
18
 * or write to the Free Software Foundation, Inc.,
19
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
 *
21
 * The development of this software was supported by the
22
 * Excellence Cluster EXC 277 Cognitive Interaction Technology.
23
 * The Excellence Cluster EXC 277 is a grant of the Deutsche
24
 * Forschungsgemeinschaft (DFG) in the context of the German
25
 * Excellence Initiative.
26
 *
27
 */
28 28

  
29 29
#include "Middleware.h"
30 30

  
31 31
using namespace std;
32 32

  
33
Middleware::Middleware(string scope){
34
    base_scope = scope;
33
Middleware::Middleware(string scope) {
34
	base_scope = scope;
35 35
}
36 36

  
37
void Middleware::set_default_emotion(RobotEmotion e, bool blocking){
38
    defaultEmotion = e;
39
    publish_default_emotion(defaultEmotion, blocking);
37
void Middleware::set_default_emotion(RobotEmotion e, bool blocking) {
38
	defaultEmotion = e;
39
	publish_default_emotion(defaultEmotion, blocking);
40 40
}
41 41

  
42
void Middleware::set_current_emotion(RobotEmotion e, bool blocking){
43
    currentEmotion = e;
44
    publish_current_emotion(currentEmotion, blocking);
42
void Middleware::set_current_emotion(RobotEmotion e, bool blocking) {
43
	currentEmotion = e;
44
	publish_current_emotion(currentEmotion, blocking);
45 45
}
46 46

  
47
RobotEmotion Middleware::get_current_emotion(){
48
    return currentEmotion;
47
RobotEmotion Middleware::get_current_emotion() {
48
	return currentEmotion;
49 49
}
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff