Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add texture files to multipart/form-data

Browse source
This commit is contained in:
David Rowe 2014-07-28 23:01:12 -07:00
parent 00abf43fae
commit edf96b749e
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
examples/editModels.js
View file

@ -281,7 +281,8 @@ var modelUploader = (function () {
ANIMATION_URL_FIELD = "animationurl", ANIMATION_URL_FIELD = "animationurl",
PITCH_FIELD = "pitch", PITCH_FIELD = "pitch",
YAW_FIELD = "yaw", YAW_FIELD = "yaw",
ROLL_FIELD = "roll"; ROLL_FIELD = "roll",
geometry;
function error(message) { function error(message) {
Window.alert(message); Window.alert(message);
@ -338,6 +339,7 @@ var modelUploader = (function () {
function readGeometry(fbxBuffer) { function readGeometry(fbxBuffer) {
var geometry, var geometry,
textures,
view, view,
index, index,
EOF; EOF;
@ -347,6 +349,7 @@ var modelUploader = (function () {
geometry = {}; geometry = {};
geometry.textures = []; geometry.textures = [];
textures = {};
view = new DataView(fbxBuffer.buffer); view = new DataView(fbxBuffer.buffer);
EOF = false; EOF = false;
@ -378,7 +381,10 @@ var modelUploader = (function () {
if (name === "relativefilename") { if (name === "relativefilename") {
filename = view.string(index + 5, view.getUint32(index + 1, true)).fileName(); filename = view.string(index + 5, view.getUint32(index + 1, true)).fileName();
geometry.textures.push(filename); if (!textures.hasOwnProperty(filename)) {
textures[filename] = "";
geometry.textures.push(filename);
}
} else if (name === "author") { } else if (name === "author") {
author = view.string(index + 5, view.getUint32(index + 1, true)); author = view.string(index + 5, view.getUint32(index + 1, true));
@ -418,7 +424,10 @@ var modelUploader = (function () {
} }
if (line.slice(0, 17).toLowerCase() === "relativefilename:") { if (line.slice(0, 17).toLowerCase() === "relativefilename:") {
filename = line.slice(line.indexOf("\""), line.lastIndexOf("\"") - line.length).fileName(); filename = line.slice(line.indexOf("\""), line.lastIndexOf("\"") - line.length).fileName();
geometry.textures.push(filename); if (!textures.hasOwnProperty(filename)) {
textures[filename] = "";
geometry.textures.push(filename);
}
} }
charCodes = []; charCodes = [];
@ -445,8 +454,7 @@ var modelUploader = (function () {
} }
function readModel() { function readModel() {
var geometry, var fbxFilename;
fbxFilename;
print("Reading model file: " + modelFile); print("Reading model file: " + modelFile);
@ -562,7 +570,10 @@ var modelUploader = (function () {
function createHttpMessage() { function createHttpMessage() {
var lodCount, var lodCount,
lodBuffer; lodBuffer,
textureCount,
textureBuffer,
i;
print("Preparing to send model"); print("Preparing to send model");
@ -607,7 +618,7 @@ var modelUploader = (function () {
// LOD files // LOD files
lodCount = 0; lodCount = 0;
for (var n in mapping["lod"]) { for (var n in mapping["lod"]) {
lodBuffer = readFile(modelFile.path() + "\\" + n); lodBuffer = readFile(modelFile.path() + "\/" + n);
httpMultiPart.add({ httpMultiPart.add({
name: "lod" + lodCount, name: "lod" + lodCount,
buffer: lodBuffer buffer: lodBuffer
@ -616,7 +627,15 @@ var modelUploader = (function () {
} }
// Textures // Textures
// DJRTODO textureCount = 0;
for (i = 0; i < geometry.textures.length; i += 1) {
textureBuffer = readFile(modelFile.path() + "\/" + mapping[TEXDIR_FIELD] + "\/" + geometry.textures[i]);
httpMultiPart.add({
name: "texture" + textureCount,
buffer: textureBuffer
});
textureCount += 1;
}
// Model category // Model category
httpMultiPart.add({ httpMultiPart.add({