Skip to content

Commit

Permalink
v3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
MaterialFoundry committed Sep 26, 2024
1 parent f2a526a commit 90cd981
Show file tree
Hide file tree
Showing 15 changed files with 1,226 additions and 1,171 deletions.
5 changes: 3 additions & 2 deletions MaterialPlane.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,9 @@ Hooks.on('ready', async ()=>{
else if (payload.msgType == 'refresh') {
window.location.reload();
}
else if (payload.msgType == 'calConfig') {
calibrationProgress.configureElements(payload.config, true)
}
if (game.user.isGM) {
if (payload.msgType == "controlToken") {
lastToken = game.canvas.tokens.get(payload.tokenId);
Expand Down Expand Up @@ -324,8 +327,6 @@ Hooks.on('closempConfig',() => {
Hooks.on('closecalibrationProgressScreen',() => {
removeOverlay();
calibrationProgress.setCalibrationRunning(false)
console.log('stopping calibration')

sendWS({event:"calibration", state:"cancel"});
});

Expand Down
18 changes: 18 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Changelog Material Plane Foundry Module

### v3.2.1 - 26-09-2024

Additions:
<ul>
<li>During the calibration configuration, a test is performed to see if the display is configured correctly (full screen, browser zoom, display scaling). A warning is given if the test failed.</li>
<li>When configuring the calibration, both the GM's and active user's configuration screens are now synchronized</li>
</ul>

Fixes:
<ul>
<li>Fixed an issue where the calibration markers would not be displayed in the correct location if a second display connected to the computer had a different resolution or scaling than the TV</li>
</ul>

Other:
<ul>
<li>Some code cleanup</li>
</ul>

### v3.2.0 - 16-08-2024

Additions:
Expand Down
270 changes: 270 additions & 0 deletions css/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,270 @@
.mpConfigTab {
overflow: hidden;
display:flex;
}

.mpConfigTab button {
background-color: #ccc;
float: left;
border: 1px solid black;
outline: none;
cursor: pointer;
transition: 0.3s;
border-radius: 5px 5px 0px 0px;
}

.mpConfigTab button:hover {
background-color: #ddd;

}

.mpConfigTab button.active {
background-color: inherit;
border: 1px solid black;
border-bottom: none;
}

.mpConfigTabContent {
padding: 6px 12px;
border: 1px solid black;
border-top: none;
min-height: 300px;
max-height: 700px;
overflow: auto;
}

.mpContentSensor {
height: 500px;
max-height: 500px;
overflow: hidden;
}

.mpConfigFormElements{
width: 100%;
display: flex;
margin-bottom: 1px;
align-items: center;
}

.mpConfigFormElements label {
width: 50%;
}

.mpConfigFormElements .mpConfigFormVal,
.mpConfigFormElements .mpConfigFormValRange,
.mpConfigFormElements .mpConfigFormBtn {
position: relative;
display: flex;
justify-content: flex-end;
width: 50%;
}

.mpConfigFormElements .mpConfigFormVal input[type='text'],
.mpConfigFormElements .mpConfigFormVal input[type='number'],
.mpConfigFormElements .mpConfigFormVal select,
.mpConfigFormElements .mpConfigFormValRange input[type='range'] {
flex-grow: 4;
}

.mpConfigFormElements .mpConfigFormValRange input[type='number'] {
width: 25%;
margin-left: 5px;
}

.mpConfigFormElements .mpConfigFormBtn button {
width: 100%;
margin-left: 5px;
}

.mpConfigFormElements .mpConfigFormBtn select {
min-width: 50%;
transform: translateY(10%);
}

.mpConfigNotes {
font-size: 0.85em;
font-style: italic;
color: grey;
margin-bottom: 5px;
}

.mpNotes {
font-size: 0.9em;
color: black;
margin-bottom: 5px;
}

.mpBaseTableId {
flex: 0 0 10%;
}
.mpBaseTableName {
flex: 0 0 20%;
}
.mpBaseTableLink {
text-align: center;
flex: 0 0 7%;
}
header.mpBaseTableHeader {
background: rgba(0, 0, 0, 0.5);
width: 100%;
padding: 5px;
border: 1px solid #191813;
text-align: left;
font-weight: bold;
color: #f0f0e0;
font-weight: bold;
text-shadow: 1px 1px #000;
}
.mpIrTableName {
flex: 0 0 25%;
}

.mpIrTableProtocol{
flex: 0 0 12.5%
}

.mpIrTableCode{
flex: 0 0 15%;
}

.mpIrTableMacro{
flex: 0 0 15%;
}

.mpIrTableArgument{
flex: 0 0 12.5%;
}

.mpIrTableDelay{
flex: 0 0 7.5%;
}

.mpIrTableLink{
flex: 0 0 5%;
}

.mpConfigContent table,
.mpConfigContent th,
.mpConfigContent td {
border: 1px solid black;
}
.mpConfigContent canvas {
border: 2px solid rgb(151, 149, 149);
}
.mpExpandable {
cursor: pointer;
}
.mpCollapsed {
display:none;
}
.mpExpandableIcon {
border: none;
}

.mpConfigColumn {
float: left;
width: 48%;
margin: 1%;
}

.mpConfigColumnLeft {
height: 425px;
overflow: auto;
}

.mpConfigColumn label {
width: 35%;
}

.mpConfigColumn .mpConfigFormVal,
.mpConfigColumn .mpConfigFormValRange,
.mpConfigColumn .mpConfigFormBtn {
width: 65%;
}

/* Clear floats after the columns */
.mpConfigRow:after {
content: "";
display: table;
clear: both;
}

.mpDownloadsTable,
.mpDownloadsTable th,
.mpDownloadsTable td {
border: none;
}

.mpDownloadsColumnLabel {
width:25%;
text-align: left;
}
.mpDownloadsColumnVersion {
width:15%;
text-align: center;
}
.mpDownloadsColumnOS {
width:15%;
text-align: center;
}
.mpDownloadsColumnButton {
width:15%;
text-align: center;
}
.mpDownloadsBtn {
width:50%;
}

/* Tooltip container */
.mpTooltip {
position: relative;
display: inline-block;
cursor: default;
overflow: visible;
max-width: 100%;
}

/* Tooltip text */
.mpTooltip .mpTooltiptext {
visibility: hidden;
background-color: black;
text-align: center;
padding: 5px;
margin-left: 5px;
border-radius: 6px;
min-width: 200px;
max-width: 200px;
opacity: 0.75;

top: -15px;
position: absolute;
z-index: 1;
font-size: 12px;
font-style: italic;
font-weight: normal;
color: darkgrey;
}

/* Show the tooltip text when you mouse over the tooltip container */
.mpTooltip:hover .mpTooltiptext {
visibility: visible;
}

.MaterialPlane_Config {
max-height: 500px;
}

.mpBaseListContainer {
min-height: 150px;
max-height: 150px;
overflow-y: scroll;
}

.mpCalError {
background-color: orange;
border: solid 1px black;
border-radius: 10px;
margin: 5px;
padding: 5px;
font-size: 0.9em;
}
Binary file added img/.thumb/MaterialFoundry2560x1440.jpg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/.thumb/macro.png.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@
"MaterialPlane.Notifications.BatteryLowSensor": "Sensor battery low.",
"MaterialPlane.Notifications.NoDrawingPermission": "User lacks permission to create drawings.",
"MaterialPlane.Notifications.NoTemplatePermission": "User lacks permission to create templates.",
"MaterialPlane.Notifications.AutoCalibrationStarting": "Performing auto calibration",
"MaterialPlane.Notifications.AutoCalibrationDone": "Auto calibration done",

"MaterialPlane.CalDialog.Singlepoint1": "Single-point calibration",
"MaterialPlane.CalDialog.Singlepoint2": "Please calibrate each corner of you screen.",
Expand Down
7 changes: 5 additions & 2 deletions module.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"title": "Material Plane",
"description": "Module for tracking physical minis. By using an IR tracking camera and mini bases with IR LED's this module can be used to move tokens in Foundry by moving physical tokens on top of a horizontally mounted TV",
"version": "3.2.0",
"version": "3.2.1",
"authors": [
{
"name": "CDeenen",
Expand All @@ -14,6 +14,9 @@
"esmodules": [
"MaterialPlane.js"
],
"styles": [
"./css/style.css"
],
"socket": true,
"flags": {
"minimumSensorVersion": "3.0.0",
Expand Down Expand Up @@ -52,7 +55,7 @@
],
"url": "https://github.com/MaterialFoundry/MaterialPlane_Foundry",
"manifest": "https://github.com/MaterialFoundry/MaterialPlane_Foundry/releases/latest/download/module.json",
"download": "https://github.com/MaterialFoundry/MaterialPlane_Foundry/releases/download/v3.1.1/module.zip",
"download": "https://github.com/MaterialFoundry/MaterialPlane_Foundry/releases/download/v3.2.1/module.zip",
"id": "MaterialPlane",
"compatibility": {
"minimum": "11",
Expand Down
Loading

0 comments on commit 90cd981

Please sign in to comment.