Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
32691c44
Commit
32691c44
authored
9 years ago
by
callum_linden
Browse files
Options
Downloads
Patches
Plain Diff
initial support for dropdown menus/select widgits
parent
311b376a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
autobuild.xml
+5
-5
5 additions, 5 deletions
autobuild.xml
indra/media_plugins/cef/media_plugin_cef.cpp
+23
-5
23 additions, 5 deletions
indra/media_plugins/cef/media_plugin_cef.cpp
with
28 additions
and
10 deletions
autobuild.xml
+
5
−
5
View file @
32691c44
...
@@ -1536,11 +1536,11 @@
...
@@ -1536,11 +1536,11 @@
<key>
archive
</key>
<key>
archive
</key>
<map>
<map>
<key>
hash
</key>
<key>
hash
</key>
<string>
db32cc2c0d898d69d01ef61df81424e8
</string>
<string>
e632f94b6f94a9563ccdfca6da38fb27
</string>
<key>
hash_algorithm
</key>
<key>
hash_algorithm
</key>
<string>
md5
</string>
<string>
md5
</string>
<key>
url
</key>
<key>
url
</key>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llceflib_3p-llceflib/rev/30
7893
/arch/Darwin/installer/llceflib-1.4.0.30
7893
-darwin-30
7893
.tar.bz2
</string>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llceflib_3p-llceflib/rev/30
8049
/arch/Darwin/installer/llceflib-1.4.0.30
8049
-darwin-30
8049
.tar.bz2
</string>
</map>
</map>
<key>
name
</key>
<key>
name
</key>
<string>
darwin
</string>
<string>
darwin
</string>
...
@@ -1550,18 +1550,18 @@
...
@@ -1550,18 +1550,18 @@
<key>
archive
</key>
<key>
archive
</key>
<map>
<map>
<key>
hash
</key>
<key>
hash
</key>
<string>
3c7f10479a6c4e0910df91b195be393f
</string>
<string>
41454f05cea1149d5124d28fc3db6ae0
</string>
<key>
hash_algorithm
</key>
<key>
hash_algorithm
</key>
<string>
md5
</string>
<string>
md5
</string>
<key>
url
</key>
<key>
url
</key>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llceflib_3p-llceflib/rev/30
7893
/arch/CYGWIN/installer/llceflib-1.4.0.30
7893
-windows-30
7893
.tar.bz2
</string>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llceflib_3p-llceflib/rev/30
8049
/arch/CYGWIN/installer/llceflib-1.4.0.30
8049
-windows-30
8049
.tar.bz2
</string>
</map>
</map>
<key>
name
</key>
<key>
name
</key>
<string>
windows
</string>
<string>
windows
</string>
</map>
</map>
</map>
</map>
<key>
version
</key>
<key>
version
</key>
<string>
1.4.0.30
7893
</string>
<string>
1.4.0.30
8049
</string>
</map>
</map>
<key>
llphysicsextensions_source
</key>
<key>
llphysicsextensions_source
</key>
<map>
<map>
...
...
This diff is collapsed.
Click to expand it.
indra/media_plugins/cef/media_plugin_cef.cpp
+
23
−
5
View file @
32691c44
...
@@ -56,7 +56,7 @@ class MediaPluginCEF :
...
@@ -56,7 +56,7 @@ class MediaPluginCEF :
private:
private:
bool
init
();
bool
init
();
void
onPageChangedCallback
(
unsigned
char
*
pixels
,
int
width
,
int
height
);
void
onPageChangedCallback
(
unsigned
char
*
pixels
,
int
x
,
int
y
,
int
width
,
int
height
,
bool
is_popup
);
void
onCustomSchemeURLCallback
(
std
::
string
url
);
void
onCustomSchemeURLCallback
(
std
::
string
url
);
void
onConsoleMessageCallback
(
std
::
string
message
,
std
::
string
source
,
int
line
);
void
onConsoleMessageCallback
(
std
::
string
message
,
std
::
string
source
,
int
line
);
void
onStatusMessageCallback
(
std
::
string
value
);
void
onStatusMessageCallback
(
std
::
string
value
);
...
@@ -149,13 +149,31 @@ void MediaPluginCEF::postDebugMessage(const std::string& msg)
...
@@ -149,13 +149,31 @@ void MediaPluginCEF::postDebugMessage(const std::string& msg)
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
//
//
void
MediaPluginCEF
::
onPageChangedCallback
(
unsigned
char
*
pixels
,
int
width
,
int
height
)
void
MediaPluginCEF
::
onPageChangedCallback
(
unsigned
char
*
pixels
,
int
x
,
int
y
,
int
width
,
int
height
,
bool
is_popup
)
{
{
if
(
mPixels
&&
pixels
)
if
(
mPixels
&&
pixels
)
{
{
if
(
mWidth
==
width
&&
mHeight
==
height
)
if
(
is_popup
)
{
{
memcpy
(
mPixels
,
pixels
,
mWidth
*
mHeight
*
mDepth
);
for
(
int
line
=
0
;
line
<
height
;
++
line
)
{
int
inverted_y
=
mHeight
-
y
-
height
;
int
src
=
line
*
width
*
mDepth
;
int
dst
=
(
inverted_y
+
line
)
*
mWidth
*
mDepth
+
x
*
mDepth
;
if
(
dst
+
width
*
mDepth
<
mWidth
*
mHeight
*
mDepth
)
{
memcpy
(
mPixels
+
dst
,
pixels
+
src
,
width
*
mDepth
);
}
}
}
else
{
if
(
mWidth
==
width
&&
mHeight
==
height
)
{
memcpy
(
mPixels
,
pixels
,
mWidth
*
mHeight
*
mDepth
);
}
}
}
setDirty
(
0
,
0
,
mWidth
,
mHeight
);
setDirty
(
0
,
0
,
mWidth
,
mHeight
);
}
}
...
@@ -399,7 +417,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
...
@@ -399,7 +417,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
if
(
message_name
==
"init"
)
if
(
message_name
==
"init"
)
{
{
// event callbacks from LLCefLib
// event callbacks from LLCefLib
mLLCEFLib
->
setOnPageChangedCallback
(
boost
::
bind
(
&
MediaPluginCEF
::
onPageChangedCallback
,
this
,
_1
,
_2
,
_3
));
mLLCEFLib
->
setOnPageChangedCallback
(
boost
::
bind
(
&
MediaPluginCEF
::
onPageChangedCallback
,
this
,
_1
,
_2
,
_3
,
_4
,
_5
,
_6
));
mLLCEFLib
->
setOnCustomSchemeURLCallback
(
boost
::
bind
(
&
MediaPluginCEF
::
onCustomSchemeURLCallback
,
this
,
_1
));
mLLCEFLib
->
setOnCustomSchemeURLCallback
(
boost
::
bind
(
&
MediaPluginCEF
::
onCustomSchemeURLCallback
,
this
,
_1
));
mLLCEFLib
->
setOnConsoleMessageCallback
(
boost
::
bind
(
&
MediaPluginCEF
::
onConsoleMessageCallback
,
this
,
_1
,
_2
,
_3
));
mLLCEFLib
->
setOnConsoleMessageCallback
(
boost
::
bind
(
&
MediaPluginCEF
::
onConsoleMessageCallback
,
this
,
_1
,
_2
,
_3
));
mLLCEFLib
->
setOnStatusMessageCallback
(
boost
::
bind
(
&
MediaPluginCEF
::
onStatusMessageCallback
,
this
,
_1
));
mLLCEFLib
->
setOnStatusMessageCallback
(
boost
::
bind
(
&
MediaPluginCEF
::
onStatusMessageCallback
,
this
,
_1
));
...
...
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