Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tuio_cpp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pirvi-public
tuio_cpp
Commits
ca2d9fb1
Commit
ca2d9fb1
authored
May 13, 2017
by
Martin Kaltenbrunner
Browse files
Options
Downloads
Patches
Plain Diff
disable TUIO_ADDED filter
parent
95ad8d81
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
TUIO/TcpSender.cpp
+1
-1
1 addition, 1 deletion
TUIO/TcpSender.cpp
TUIO/TuioServer.cpp
+4
-4
4 additions, 4 deletions
TUIO/TuioServer.cpp
TUIO/WebSockSender.cpp
+3
-3
3 additions, 3 deletions
TUIO/WebSockSender.cpp
with
8 additions
and
8 deletions
TUIO/TcpSender.cpp
+
1
−
1
View file @
ca2d9fb1
...
...
@@ -34,7 +34,7 @@ static void* ClientThreadFunc( void* obj )
int
client
=
sender
->
tcp_client_list
.
back
();
#endif
in
t
connected
=
1
;
size_
t
connected
=
1
;
while
(
connected
)
{
connected
=
recv
(
client
,
buf
,
sizeof
(
buf
),
0
);
}
...
...
This diff is collapsed.
Click to expand it.
TUIO/TuioServer.cpp
+
4
−
4
View file @
ca2d9fb1
...
...
@@ -302,14 +302,14 @@ void TuioServer::startCursorBundle() {
if
(
source_name
)
(
*
oscPacket
)
<<
osc
::
BeginMessage
(
"/tuio/2Dcur"
)
<<
"source"
<<
source_name
<<
osc
::
EndMessage
;
(
*
oscPacket
)
<<
osc
::
BeginMessage
(
"/tuio/2Dcur"
)
<<
"alive"
;
for
(
std
::
list
<
TuioCursor
*>::
iterator
tuioCursor
=
cursorList
.
begin
();
tuioCursor
!=
cursorList
.
end
();
tuioCursor
++
)
{
if
((
*
tuioCursor
)
->
getTuioState
()
!=
TUIO_ADDED
)
(
*
oscPacket
)
<<
(
int32
)((
*
tuioCursor
)
->
getSessionID
());
/*
if ((*tuioCursor)->getTuioState()!=TUIO_ADDED)
*/
(
*
oscPacket
)
<<
(
int32
)((
*
tuioCursor
)
->
getSessionID
());
}
(
*
oscPacket
)
<<
osc
::
EndMessage
;
}
void
TuioServer
::
addCursorMessage
(
TuioCursor
*
tcur
)
{
if
(
tcur
->
getTuioState
()
==
TUIO_ADDED
)
return
;
//
if (tcur->getTuioState()==TUIO_ADDED) return;
float
xpos
=
tcur
->
getX
();
float
xvel
=
tcur
->
getXSpeed
();
...
...
@@ -407,14 +407,14 @@ void TuioServer::startBlobBundle() {
if
(
source_name
)
(
*
oscPacket
)
<<
osc
::
BeginMessage
(
"/tuio/2Dblb"
)
<<
"source"
<<
source_name
<<
osc
::
EndMessage
;
(
*
oscPacket
)
<<
osc
::
BeginMessage
(
"/tuio/2Dblb"
)
<<
"alive"
;
for
(
std
::
list
<
TuioBlob
*>::
iterator
tuioBlob
=
blobList
.
begin
();
tuioBlob
!=
blobList
.
end
();
tuioBlob
++
)
{
if
((
*
tuioBlob
)
->
getTuioState
()
!=
TUIO_ADDED
)
(
*
oscPacket
)
<<
(
int32
)((
*
tuioBlob
)
->
getSessionID
());
/*
if ((*tuioBlob)->getTuioState()!=TUIO_ADDED)
*/
(
*
oscPacket
)
<<
(
int32
)((
*
tuioBlob
)
->
getSessionID
());
}
(
*
oscPacket
)
<<
osc
::
EndMessage
;
}
void
TuioServer
::
addBlobMessage
(
TuioBlob
*
tblb
)
{
if
(
tblb
->
getTuioState
()
==
TUIO_ADDED
)
return
;
//
if (tblb->getTuioState()==TUIO_ADDED) return;
float
xpos
=
tblb
->
getX
();
float
xvel
=
tblb
->
getXSpeed
();
...
...
This diff is collapsed.
Click to expand it.
TUIO/WebSockSender.cpp
+
3
−
3
View file @
ca2d9fb1
...
...
@@ -62,7 +62,7 @@ bool WebSockSender::sendOscPacket (osc::OutboundPacketStream *bundle) {
#endif
for
(
client
=
tcp_client_list
.
begin
();
client
!=
tcp_client_list
.
end
();
client
++
)
{
in
t
len
=
bundle
->
Size
();
size_
t
len
=
bundle
->
Size
();
// add WebSocket header on top
uint8_t
header
[
4
]
=
{
0x82
,
...
...
@@ -149,7 +149,7 @@ void WebSockSender::newClient( int tcp_client ) {
void
WebSockSender
::
sha1
(
uint8_t
digest
[
SHA1_HASH_SIZE
],
const
uint8_t
*
inbuf
,
size_t
length
)
{
size_
t
i
,
j
;
in
t
i
,
j
;
int
remaining_bytes
;
uint32_t
h0
,
h1
,
h2
,
h3
,
h4
,
a
,
b
,
c
,
d
,
e
,
temp
;
uint32_t
w
[
80
];
...
...
@@ -170,7 +170,7 @@ void WebSockSender::sha1( uint8_t digest[SHA1_HASH_SIZE], const uint8_t* inbuf,
for
(
i
=
0
;
i
<
length
+
9
;
i
+=
64
)
{
/* Perform any padding necessary. */
remaining_bytes
=
length
-
i
;
remaining_bytes
=
(
int
)
length
-
i
;
if
(
remaining_bytes
>=
64
)
{
memcpy
(
buf
,
inbuf
+
i
,
64
);
}
else
if
(
remaining_bytes
>=
0
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment