Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 20:44:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Changed back to upload either head or skeleton

Browse source
This commit is contained in:
Atlante45 2014-03-26 15:04:45 -07:00
parent d90ebfd29a
commit 718b8f7eb9
6 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Application.cpp
View file

@ -3512,13 +3512,21 @@ void Application::reloadAllScripts() {
}
}
void Application::uploadFST() {
FstReader reader;
void Application::uploadFST(bool isHead) {
FstReader reader(isHead);
if (reader.zip()) {
reader.send();
}
}
void Application::uploadHead() {
uploadFST(true);
}
void Application::uploadSkeleton() {
uploadFST(false);
}
void Application::removeScriptName(const QString& fileNameString) {
_activeScripts.removeOne(fileNameString);
}

4
interface/src/Application.h
View file

@ -261,7 +261,9 @@ public slots:
void stopAllScripts();
void reloadAllScripts();
void uploadFST();
void uploadFST(bool isHead);
void uploadHead();
void uploadSkeleton();
private slots:
void timer();

3
interface/src/Menu.cpp
View file

@ -144,7 +144,8 @@ Menu::Menu() :
SLOT(goTo()));
addDisabledActionAndSeparator(fileMenu, "Upload Avatar Model");
addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadFST, 0, Application::getInstance(), SLOT(uploadFST()));
addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadHead, 0, Application::getInstance(), SLOT(uploadHead()));
addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadSkeleton, 0, Application::getInstance(), SLOT(uploadSkeleton()));
addDisabledActionAndSeparator(fileMenu, "Settings");
addActionToQMenuAndActionHash(fileMenu, MenuOption::SettingsImport, 0, this, SLOT(importSettings()));

3
interface/src/Menu.h
View file

@ -298,7 +298,8 @@ namespace MenuOption {
const QString StopAllScripts = "Stop All Scripts";
const QString TestPing = "Test Ping";
const QString TransmitterDrive = "Transmitter Drive";
const QString UploadFST = "Upload FST file";
const QString UploadHead = "Upload Head Model";
const QString UploadSkeleton = "Upload Skeleton Model";
const QString Visage = "Visage";
const QString Quit = "Quit";
const QString Voxels = "Voxels";

9
libraries/shared/src/FstReader.cpp
View file

@ -25,17 +25,16 @@ static const QString NAME_FIELD = "name";
static const QString FILENAME_FIELD = "filename";
static const QString TEXDIR_FIELD = "texdir";
static const QString LOD_FIELD = "lod";
static const QString HEAD_SPECIFIC_FIELD = "bs";
static const QString MODEL_URL = "/api/v1/models";
static const int MAX_SIZE = 10 * 1024 * 1024; // 10 MB
FstReader::FstReader() :
FstReader::FstReader(bool isHead) :
_lodCount(-1),
_texturesCount(-1),
_totalSize(0),
_isHead(false),
_isHead(isHead),
_readyToSend(false),
_dataMultiPart(new QHttpMultiPart(QHttpMultiPart::FormDataType))
{
@ -95,9 +94,7 @@ bool FstReader::zip() {
}
// according to what is read, we modify the command
if (line[1] == HEAD_SPECIFIC_FIELD) {
_isHead = true;
} else if (line[1] == NAME_FIELD) {
if (line[0] == NAME_FIELD) {
QHttpPart textPart;
textPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data;"
" name=\"model_name\"");

2
libraries/shared/src/FstReader.h
View file

@ -16,7 +16,7 @@ class QHttpMultiPart;
class FstReader {
public:
FstReader();
FstReader(bool isHead);
~FstReader();
bool zip();