make GRPC work on Linux,

This commit is contained in:
Erwin Coumans
2018-09-04 16:56:34 -07:00
parent 51f9a6fd0d
commit 18b782847d
7 changed files with 584 additions and 87 deletions

View File

@@ -8,12 +8,12 @@
#include <google/protobuf/stubs/common.h>
#if GOOGLE_PROTOBUF_VERSION < 3006000
#if GOOGLE_PROTOBUF_VERSION < 3006001
#error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
@@ -38,7 +38,7 @@ namespace protobuf_pybullet_2eproto {
struct TableStruct {
static const ::google::protobuf::internal::ParseTableField entries[];
static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
static const ::google::protobuf::internal::ParseTable schema[39];
static const ::google::protobuf::internal::ParseTable schema[40];
static const ::google::protobuf::internal::FieldMetadata field_metadata[];
static const ::google::protobuf::internal::SerializationTable serialization_table[];
static const ::google::protobuf::uint32 offsets[];
@@ -121,6 +121,9 @@ extern RequestCameraImageStatusDefaultTypeInternal _RequestCameraImageStatus_def
class RequestKeyboardEventsCommand;
class RequestKeyboardEventsCommandDefaultTypeInternal;
extern RequestKeyboardEventsCommandDefaultTypeInternal _RequestKeyboardEventsCommand_default_instance_;
class ResetSimulationCommand;
class ResetSimulationCommandDefaultTypeInternal;
extern ResetSimulationCommandDefaultTypeInternal _ResetSimulationCommand_default_instance_;
class SdfLoadedStatus;
class SdfLoadedStatusDefaultTypeInternal;
extern SdfLoadedStatusDefaultTypeInternal _SdfLoadedStatus_default_instance_;
@@ -191,6 +194,7 @@ template<> ::pybullet_grpc::RequestBodyInfoStatus* Arena::CreateMaybeMessage<::p
template<> ::pybullet_grpc::RequestCameraImageCommand* Arena::CreateMaybeMessage<::pybullet_grpc::RequestCameraImageCommand>(Arena*);
template<> ::pybullet_grpc::RequestCameraImageStatus* Arena::CreateMaybeMessage<::pybullet_grpc::RequestCameraImageStatus>(Arena*);
template<> ::pybullet_grpc::RequestKeyboardEventsCommand* Arena::CreateMaybeMessage<::pybullet_grpc::RequestKeyboardEventsCommand>(Arena*);
template<> ::pybullet_grpc::ResetSimulationCommand* Arena::CreateMaybeMessage<::pybullet_grpc::ResetSimulationCommand>(Arena*);
template<> ::pybullet_grpc::SdfLoadedStatus* Arena::CreateMaybeMessage<::pybullet_grpc::SdfLoadedStatus>(Arena*);
template<> ::pybullet_grpc::SendActualStateStatus* Arena::CreateMaybeMessage<::pybullet_grpc::SendActualStateStatus>(Arena*);
template<> ::pybullet_grpc::StepSimulationCommand* Arena::CreateMaybeMessage<::pybullet_grpc::StepSimulationCommand>(Arena*);
@@ -5706,6 +5710,102 @@ class RequestCameraImageStatus : public ::google::protobuf::Message /* @@protoc_
};
// -------------------------------------------------------------------
class ResetSimulationCommand : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pybullet_grpc.ResetSimulationCommand) */ {
public:
ResetSimulationCommand();
virtual ~ResetSimulationCommand();
ResetSimulationCommand(const ResetSimulationCommand& from);
inline ResetSimulationCommand& operator=(const ResetSimulationCommand& from) {
CopyFrom(from);
return *this;
}
#if LANG_CXX11
ResetSimulationCommand(ResetSimulationCommand&& from) noexcept
: ResetSimulationCommand() {
*this = ::std::move(from);
}
inline ResetSimulationCommand& operator=(ResetSimulationCommand&& from) noexcept {
if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
if (this != &from) InternalSwap(&from);
} else {
CopyFrom(from);
}
return *this;
}
#endif
static const ::google::protobuf::Descriptor* descriptor();
static const ResetSimulationCommand& default_instance();
static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY
static inline const ResetSimulationCommand* internal_default_instance() {
return reinterpret_cast<const ResetSimulationCommand*>(
&_ResetSimulationCommand_default_instance_);
}
static constexpr int kIndexInFileMessages =
37;
void Swap(ResetSimulationCommand* other);
friend void swap(ResetSimulationCommand& a, ResetSimulationCommand& b) {
a.Swap(&b);
}
// implements Message ----------------------------------------------
inline ResetSimulationCommand* New() const final {
return CreateMaybeMessage<ResetSimulationCommand>(NULL);
}
ResetSimulationCommand* New(::google::protobuf::Arena* arena) const final {
return CreateMaybeMessage<ResetSimulationCommand>(arena);
}
void CopyFrom(const ::google::protobuf::Message& from) final;
void MergeFrom(const ::google::protobuf::Message& from) final;
void CopyFrom(const ResetSimulationCommand& from);
void MergeFrom(const ResetSimulationCommand& from);
void Clear() final;
bool IsInitialized() const final;
size_t ByteSizeLong() const final;
bool MergePartialFromCodedStream(
::google::protobuf::io::CodedInputStream* input) final;
void SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const final;
::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* target) const final;
int GetCachedSize() const final { return _cached_size_.Get(); }
private:
void SharedCtor();
void SharedDtor();
void SetCachedSize(int size) const final;
void InternalSwap(ResetSimulationCommand* other);
private:
inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
return NULL;
}
inline void* MaybeArenaPtr() const {
return NULL;
}
public:
::google::protobuf::Metadata GetMetadata() const final;
// nested types ----------------------------------------------------
// accessors -------------------------------------------------------
// @@protoc_insertion_point(class_scope:pybullet_grpc.ResetSimulationCommand)
private:
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
friend struct ::protobuf_pybullet_2eproto::TableStruct;
};
// -------------------------------------------------------------------
class PyBulletCommand : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pybullet_grpc.PyBulletCommand) */ {
public:
PyBulletCommand();
@@ -5754,6 +5854,7 @@ class PyBulletCommand : public ::google::protobuf::Message /* @@protoc_insertion
kCheckVersionCommand = 19,
kRequestKeyboardEventsCommand = 20,
kRequestCameraImageCommand = 21,
kResetSimulationCommand = 22,
COMMANDS_NOT_SET = 0,
};
@@ -5763,7 +5864,7 @@ class PyBulletCommand : public ::google::protobuf::Message /* @@protoc_insertion
&_PyBulletCommand_default_instance_);
}
static constexpr int kIndexInFileMessages =
37;
38;
void Swap(PyBulletCommand* other);
friend void swap(PyBulletCommand& a, PyBulletCommand& b) {
@@ -6081,6 +6182,18 @@ class PyBulletCommand : public ::google::protobuf::Message /* @@protoc_insertion
::pybullet_grpc::RequestCameraImageCommand* mutable_requestcameraimagecommand();
void set_allocated_requestcameraimagecommand(::pybullet_grpc::RequestCameraImageCommand* requestcameraimagecommand);
// .pybullet_grpc.ResetSimulationCommand resetSimulationCommand = 22;
bool has_resetsimulationcommand() const;
void clear_resetsimulationcommand();
static const int kResetSimulationCommandFieldNumber = 22;
private:
const ::pybullet_grpc::ResetSimulationCommand& _internal_resetsimulationcommand() const;
public:
const ::pybullet_grpc::ResetSimulationCommand& resetsimulationcommand() const;
::pybullet_grpc::ResetSimulationCommand* release_resetsimulationcommand();
::pybullet_grpc::ResetSimulationCommand* mutable_resetsimulationcommand();
void set_allocated_resetsimulationcommand(::pybullet_grpc::ResetSimulationCommand* resetsimulationcommand);
void clear_commands();
CommandsCase commands_case() const;
// @@protoc_insertion_point(class_scope:pybullet_grpc.PyBulletCommand)
@@ -6103,6 +6216,7 @@ class PyBulletCommand : public ::google::protobuf::Message /* @@protoc_insertion
void set_has_checkversioncommand();
void set_has_requestkeyboardeventscommand();
void set_has_requestcameraimagecommand();
void set_has_resetsimulationcommand();
inline bool has_commands() const;
inline void clear_has_commands();
@@ -6131,6 +6245,7 @@ class PyBulletCommand : public ::google::protobuf::Message /* @@protoc_insertion
::pybullet_grpc::CheckVersionCommand* checkversioncommand_;
::pybullet_grpc::RequestKeyboardEventsCommand* requestkeyboardeventscommand_;
::pybullet_grpc::RequestCameraImageCommand* requestcameraimagecommand_;
::pybullet_grpc::ResetSimulationCommand* resetsimulationcommand_;
} commands_;
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::google::protobuf::uint32 _oneof_case_[1];
@@ -6191,7 +6306,7 @@ class PyBulletStatus : public ::google::protobuf::Message /* @@protoc_insertion_
&_PyBulletStatus_default_instance_);
}
static constexpr int kIndexInFileMessages =
38;
39;
void Swap(PyBulletStatus* other);
friend void swap(PyBulletStatus& a, PyBulletStatus& b) {
@@ -11090,6 +11205,10 @@ inline void RequestCameraImageStatus::set_numremainingpixels(::google::protobuf:
// -------------------------------------------------------------------
// ResetSimulationCommand
// -------------------------------------------------------------------
// PyBulletCommand
// int32 commandType = 1;
@@ -12036,6 +12155,50 @@ inline ::pybullet_grpc::RequestCameraImageCommand* PyBulletCommand::mutable_requ
return commands_.requestcameraimagecommand_;
}
// .pybullet_grpc.ResetSimulationCommand resetSimulationCommand = 22;
inline bool PyBulletCommand::has_resetsimulationcommand() const {
return commands_case() == kResetSimulationCommand;
}
inline void PyBulletCommand::set_has_resetsimulationcommand() {
_oneof_case_[0] = kResetSimulationCommand;
}
inline void PyBulletCommand::clear_resetsimulationcommand() {
if (has_resetsimulationcommand()) {
delete commands_.resetsimulationcommand_;
clear_has_commands();
}
}
inline const ::pybullet_grpc::ResetSimulationCommand& PyBulletCommand::_internal_resetsimulationcommand() const {
return *commands_.resetsimulationcommand_;
}
inline ::pybullet_grpc::ResetSimulationCommand* PyBulletCommand::release_resetsimulationcommand() {
// @@protoc_insertion_point(field_release:pybullet_grpc.PyBulletCommand.resetSimulationCommand)
if (has_resetsimulationcommand()) {
clear_has_commands();
::pybullet_grpc::ResetSimulationCommand* temp = commands_.resetsimulationcommand_;
commands_.resetsimulationcommand_ = NULL;
return temp;
} else {
return NULL;
}
}
inline const ::pybullet_grpc::ResetSimulationCommand& PyBulletCommand::resetsimulationcommand() const {
// @@protoc_insertion_point(field_get:pybullet_grpc.PyBulletCommand.resetSimulationCommand)
return has_resetsimulationcommand()
? *commands_.resetsimulationcommand_
: *reinterpret_cast< ::pybullet_grpc::ResetSimulationCommand*>(&::pybullet_grpc::_ResetSimulationCommand_default_instance_);
}
inline ::pybullet_grpc::ResetSimulationCommand* PyBulletCommand::mutable_resetsimulationcommand() {
if (!has_resetsimulationcommand()) {
clear_commands();
set_has_resetsimulationcommand();
commands_.resetsimulationcommand_ = CreateMaybeMessage< ::pybullet_grpc::ResetSimulationCommand >(
GetArenaNoVirtual());
}
// @@protoc_insertion_point(field_mutable:pybullet_grpc.PyBulletCommand.resetSimulationCommand)
return commands_.resetsimulationcommand_;
}
inline bool PyBulletCommand::has_commands() const {
return commands_case() != COMMANDS_NOT_SET;
}
@@ -12861,6 +13024,8 @@ inline PyBulletStatus::StatusCase PyBulletStatus::status_case() const {
// -------------------------------------------------------------------
// -------------------------------------------------------------------
// @@protoc_insertion_point(namespace_scope)