Skip to content

Commit

Permalink
[Automated] Merged develop into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@ynbot
ynbot committed May 24, 2023
2 parents eea816f + a73d19b commit f49eb5d
Show file tree
Hide file tree
Showing 66 changed files with 3,695 additions and 1,395 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ body:
label: Version
description: What version are you running? Look to OpenPype Tray
options:
- 3.15.8-nightly.2
- 3.15.8-nightly.1
- 3.15.7
- 3.15.7-nightly.3
Expand Down Expand Up @@ -134,7 +135,6 @@ body:
- 3.14.2-nightly.2
- 3.14.2-nightly.1
- 3.14.1
- 3.14.1-nightly.4
validations:
required: true
- type: dropdown
Expand Down
10 changes: 5 additions & 5 deletions openpype/hosts/aftereffects/api/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
"""

from .launch_logic import (
from .ws_stub import (
get_stub,
stub,
)

from .pipeline import (
Expand All @@ -18,7 +17,8 @@
from .lib import (
maintained_selection,
get_extension_manifest_path,
get_asset_settings
get_asset_settings,
set_settings
)

from .plugin import (
Expand All @@ -27,9 +27,8 @@


__all__ = [
# launch_logic
# ws_stub
"get_stub",
"stub",

# pipeline
"ls",
Expand All @@ -39,6 +38,7 @@
"maintained_selection",
"get_extension_manifest_path",
"get_asset_settings",
"set_settings",

# plugin
"AfterEffectsLoader"
Expand Down
Binary file modified openpype/hosts/aftereffects/api/extension.zxp
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions openpype/hosts/aftereffects/api/extension/CSXS/manifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ExtensionManifest Version="8.0" ExtensionBundleId="com.openpype.AE.panel" ExtensionBundleVersion="1.0.24"
ExtensionBundleName="openpype" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ExtensionManifest Version="8.0" ExtensionBundleId="com.openpype.AE.panel" ExtensionBundleVersion="1.0.25"
ExtensionBundleName="com.openpype.AE.panel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ExtensionList>
<Extension Id="com.openpype.AE.panel" Version="1.0" />
</ExtensionList>
Expand Down
72 changes: 54 additions & 18 deletions openpype/hosts/aftereffects/api/extension/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">

<link rel="stylesheet" href="css/topcoat-desktop-dark.min.css"/>
<link id="hostStyle" rel="stylesheet" href="css/styles.css"/>

Expand All @@ -25,19 +25,19 @@

<title></title>
<script src="js/libs/jquery-2.0.2.min.js"></script>

<script type=text/javascript>
$(function() {
$("a#workfiles-button").bind("click", function() {

RPC.call('AfterEffects.workfiles_route').then(function (data) {
}, function (error) {
alert(error);
});
});
});
</script>

<script type=text/javascript>
$(function() {
$("a#loader-button").bind("click", function() {
Expand All @@ -48,7 +48,7 @@
});
});
</script>

<script type=text/javascript>
$(function() {
$("a#publish-button").bind("click", function() {
Expand All @@ -59,7 +59,7 @@
});
});
</script>

<script type=text/javascript>
$(function() {
$("a#sceneinventory-button").bind("click", function() {
Expand All @@ -70,7 +70,40 @@
});
});
</script>


<script type=text/javascript>
$(function() {
$("a#setresolution-button").bind("click", function() {
RPC.call('AfterEffects.setresolution_route').then(function (data) {
}, function (error) {
alert(error);
});
});
});
</script>

<script type=text/javascript>
$(function() {
$("a#setframes-button").bind("click", function() {
RPC.call('AfterEffects.setframes_route').then(function (data) {
}, function (error) {
alert(error);
});
});
});
</script>

<script type=text/javascript>
$(function() {
$("a#setall-button").bind("click", function() {
RPC.call('AfterEffects.setall_route').then(function (data) {
}, function (error) {
alert(error);
});
});
});
</script>

<script type=text/javascript>
$(function() {
$("a#experimental-button").bind("click", function() {
Expand All @@ -80,25 +113,28 @@
});
});
});
</script>
</script>


</head>

<body class="hostElt">

<div id="content">
<div>
<div id="content">

<div>
<div></div><a href=# id=workfiles-button><button class="hostFontSize">Workfiles...</button></a></div>
<div><a href=# id=loader-button><button class="hostFontSize">Load...</button></a></div>
<div><a href=# id=publish-button><button class="hostFontSize">Publish...</button></a></div>
<div><a href=# id=sceneinventory-button><button class="hostFontSize">Manage...</button></a></div>
<div><a href=# id=setresolution-button><button class="hostFontSize">Set Resolution</button></a></div>
<div><a href=# id=setframes-button><button class="hostFontSize">Set Frame Range</button></a></div>
<div><a href=# id=setall-button><button class="hostFontSize">Apply All Settings</button></a></div>
<div><a href=# id=experimental-button><button class="hostFontSize">Experimental Tools...</button></a></div>
</div>
</div>

</div>

<!-- <script src="js/libs/PlayerDebugMode"></script> -->
<script src="js/libs/wsrpc.js"></script>
<script src="js/libs/loglevel.min.js"></script>
Expand All @@ -107,6 +143,6 @@
<script src="js/themeManager.js"></script>
<script src="js/main.js"></script>


</body>
</html>
</html>
56 changes: 34 additions & 22 deletions openpype/hosts/aftereffects/api/extension/js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ indent: 4, maxerr: 50 */


var csInterface = new CSInterface();

log.warn("script start");

WSRPC.DEBUG = false;
Expand All @@ -14,7 +14,7 @@ WSRPC.TRACE = false;
async function startUp(url){
promis = runEvalScript("getEnv('" + url + "')");

var res = await promis;
var res = await promis;
log.warn("res: " + res);

promis = runEvalScript("getEnv('OPENPYPE_DEBUG')");
Expand Down Expand Up @@ -56,7 +56,7 @@ function get_extension_version(){
}

function main(websocket_url){
// creates connection to 'websocket_url', registers routes
// creates connection to 'websocket_url', registers routes
var default_url = 'ws://localhost:8099/ws/';

if (websocket_url == ''){
Expand All @@ -66,7 +66,7 @@ function main(websocket_url){

RPC.connect();

log.warn("connected");
log.warn("connected");

RPC.addRoute('AfterEffects.open', function (data) {
log.warn('Server called client route "open":', data);
Expand All @@ -88,7 +88,7 @@ function main(websocket_url){
});

RPC.addRoute('AfterEffects.get_active_document_name', function (data) {
log.warn('Server called client route ' +
log.warn('Server called client route ' +
'"get_active_document_name":', data);
return runEvalScript("getActiveDocumentName()")
.then(function(result){
Expand All @@ -98,7 +98,7 @@ function main(websocket_url){
});

RPC.addRoute('AfterEffects.get_active_document_full_name', function (data){
log.warn('Server called client route ' +
log.warn('Server called client route ' +
'"get_active_document_full_name":', data);
return runEvalScript("getActiveDocumentFullName()")
.then(function(result){
Expand All @@ -118,7 +118,7 @@ function main(websocket_url){
});
});


RPC.addRoute('AfterEffects.get_selected_items', function (data) {
log.warn('Server called client route "get_selected_items":', data);
return runEvalScript("getSelectedItems(" + data.comps + "," +
Expand Down Expand Up @@ -194,23 +194,25 @@ function main(websocket_url){
});
});

RPC.addRoute('AfterEffects.get_work_area', function (data) {
log.warn('Server called client route "get_work_area":', data);
return runEvalScript("getWorkArea(" + data.item_id + ")")
RPC.addRoute('AfterEffects.get_comp_properties', function (data) {
log.warn('Server called client route "get_comp_properties":', data);
return runEvalScript("getCompProperties(" + data.item_id + ")")
.then(function(result){
log.warn("getWorkArea: " + result);
log.warn("get_comp_properties: " + result);
return result;
});
});

RPC.addRoute('AfterEffects.set_work_area', function (data) {
RPC.addRoute('AfterEffects.set_comp_properties', function (data) {
log.warn('Server called client route "set_work_area":', data);
return runEvalScript("setWorkArea(" + data.item_id + ',' +
return runEvalScript("setCompProperties(" + data.item_id + ',' +
data.start + ',' +
data.duration + ',' +
data.frame_rate + ")")
data.frame_rate + ',' +
data.width + ',' +
data.height + ")")
.then(function(result){
log.warn("getWorkArea: " + result);
log.warn("set_comp_properties: " + result);
return result;
});
});
Expand Down Expand Up @@ -255,7 +257,7 @@ function main(websocket_url){

RPC.addRoute('AfterEffects.import_background', function (data) {
log.warn('Server called client route "import_background":', data);
return runEvalScript("importBackground(" + data.comp_id + ", " +
return runEvalScript("importBackground(" + data.comp_id + ", " +
"'" + data.comp_name + "', " +
JSON.stringify(data.files) + ")")
.then(function(result){
Expand All @@ -266,7 +268,7 @@ function main(websocket_url){

RPC.addRoute('AfterEffects.reload_background', function (data) {
log.warn('Server called client route "reload_background":', data);
return runEvalScript("reloadBackground(" + data.comp_id + ", " +
return runEvalScript("reloadBackground(" + data.comp_id + ", " +
"'" + data.comp_name + "', " +
JSON.stringify(data.files) + ")")
.then(function(result){
Expand Down Expand Up @@ -314,6 +316,16 @@ function main(websocket_url){
log.warn('Server called client route "close":', data);
return runEvalScript("close()");
});

RPC.addRoute('AfterEffects.print_msg', function (data) {
log.warn('Server called client route "print_msg":', data);
var escaped_msg = EscapeStringForJSX(data.msg);
return runEvalScript("printMsg('" + escaped_msg +"')")
.then(function(result){
log.warn("print_msg: " + result);
return result;
});
});
}

/** main entry point **/
Expand All @@ -323,17 +335,17 @@ startUp("WEBSOCKET_URL");
'use strict';

var csInterface = new CSInterface();


function init() {

themeManager.init();

$("#btn_test").click(function () {
csInterface.evalScript('sayHello()');
});
}

init();

}());
Expand Down
Loading

0 comments on commit f49eb5d

Please sign in to comment.