Revision c492be62
ID | c492be629f06e3cf71fdf832ce2cd5ac1ec779f8 |
Updated the licensing information in many files.
This is a broken commit because I decided to do this at a bad time. Sorry! The build will be working after next commit, I promise (and I won't push till then). This commit reflects the licensing in the files after I used my auto-add/remove script.
scout/scoutsim/src/sim_frame.cpp | ||
---|---|---|
1 |
/* |
|
2 |
* This package was developed by the CMU Robotics Club project using code |
|
3 |
* from Willow Garage, Inc. Please see licensing.txt for details. |
|
1 |
/** |
|
2 |
* The code in this package was developed using the structure of Willow |
|
3 |
* Garage's turtlesim package. It was modified by the CMU Robotics Club |
|
4 |
* to be used as a simulator for the Colony Scout robot. |
|
4 | 5 |
* |
6 |
* All redistribution of this code is limited to the terms of Willow Garage's |
|
7 |
* licensing terms, as well as under permission from the CMU Robotics Club. |
|
8 |
* |
|
9 |
* Copyright (c) 2011 Colony Project |
|
10 |
* |
|
11 |
* Permission is hereby granted, free of charge, to any person |
|
12 |
* obtaining a copy of this software and associated documentation |
|
13 |
* files (the "Software"), to deal in the Software without |
|
14 |
* restriction, including without limitation the rights to use, |
|
15 |
* copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
16 |
* copies of the Software, and to permit persons to whom the |
|
17 |
* Software is furnished to do so, subject to the following |
|
18 |
* conditions: |
|
19 |
* |
|
20 |
* The above copyright notice and this permission notice shall be |
|
21 |
* included in all copies or substantial portions of the Software. |
|
22 |
* |
|
23 |
* Copyright (c) 2009, Willow Garage, Inc. |
|
5 | 24 |
* All rights reserved. |
6 |
* |
|
7 |
* @brief Keeps track of the frame (visualization of the whole environment). |
|
8 |
* @file sim_frame.cpp |
|
9 |
* @author Colony Project, CMU Robotics Club |
|
10 |
* @author Alex Zirbel |
|
25 |
* |
|
26 |
* Redistribution and use in source and binary forms, with or without |
|
27 |
* modification, are permitted provided that the following conditions are met: |
|
28 |
* |
|
29 |
* Redistributions of source code must retain the above copyright |
|
30 |
* notice, this list of conditions and the following disclaimer. |
|
31 |
* Redistributions in binary form must reproduce the above copyright |
|
32 |
* notice, this list of conditions and the following disclaimer in the |
|
33 |
* documentation and/or other materials provided with the distribution. |
|
34 |
* Neither the name of the Willow Garage, Inc. nor the names of its |
|
35 |
* contributors may be used to endorse or promote products derived from |
|
36 |
* this software without specific prior written permission. |
|
37 |
* |
|
38 |
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
|
39 |
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
40 |
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
41 |
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
42 |
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
43 |
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
44 |
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
45 |
* OTHER DEALINGS IN THE SOFTWARE. |
|
11 | 46 |
*/ |
12 | 47 |
|
13 | 48 |
#include "sim_frame.h" |
... | ... | |
216 | 251 |
width_in_meters, height_in_meters); |
217 | 252 |
} |
218 | 253 |
|
219 |
++frame_count;
|
|
254 |
frame_count++;
|
|
220 | 255 |
} |
221 | 256 |
|
222 |
|
|
223 | 257 |
bool SimFrame::clearCallback(std_srvs::Empty::Request&, |
224 | 258 |
std_srvs::Empty::Response&) |
225 | 259 |
{ |
Also available in: Unified diff