AriasCreations/furware
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merged changes by mewtwo064

Browse source
This commit is contained in:
Ochi Wolfe 2013-09-03 20:25:31 +02:00
parent ce2f9b0f24
commit a9af3ba139
2 changed files with 14 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
FURWARE text display creator.lsl
View file

@ -206,7 +206,7 @@ state Create {
vector color = <1.0, 1.0, 1.0>; vector color = <1.0, 1.0, 1.0>;
if ((col+row)%2) color = <0.7, 0.7, 0.7>; if ((col+row)%2) color = <0.7, 0.7, 0.7>;
llRegionSayTo(id, -2783468, "FURWARE text mesh:" + setName + ":" + (string)row + ":" + (string)col + ";" + (string)color + ";" + (string)scale); llRegionSayTo(id, -2783468, "FURWARE text mesh:" + setName + ":" + (string)row + ":" + (string)col + ":" + (string)primType + ";" + (string)color + ";" + (string)scale);
++cur; ++cur;
++col; ++col;

51
FURWARE text.lsl
View file

@ -6,7 +6,7 @@
// 000 ,F ¯°0#¡000L // // 000 ,F ¯°0#¡000L //
// FURWARE text #00 ¡ ¡0 000#00 ^ // // FURWARE text #00 ¡ ¡0 000#00 ^ //
// #0 ]O 00 #0 00 #L // // #0 ]O 00 #0 00 #L //
// Version 2.0.2 0 #0 0O J0 #0 0O // // Version 2.0.1-git 0 #0 0O J0 #0 0O //
// Open Source v #00#0¡ #0 0 ]0O // // Open Source v #00#0¡ #0 0 ]0O //
// J000000c_ J0 c00^ // // J000000c_ J0 c00^ //
// 0000c^00@NN ,#000 // // 0000c^00@NN ,#000 //
@ -58,18 +58,11 @@ THE SOFTWARE.
/* /*
Version 2.0.2: ElectaFox Spark ElectaFox Spark - Fixes for compatibility with OpenSim.
* Order of operations and variable naming fixes so that the script compiles under OpenSim Ochi Wolfe - Initial development from 2010 to 2013.
* Add a temporary fix for OpenSim users regarding llGetLinkNumberOfSides()'s current inability to gather the number of faces from a mesh object properly (It always returns 8 regardless of the actual number of sides)
Version 1.x.x - 2.0.1: Ochi Wolfe - Initial development from 2010 to 2013.
*/ */
////////// CONFIGURABLES ////////////////////////////////////
integer giOpenSim = FALSE; //If TRUE, this tells the script to get set face information from the item description in the format set_name1,num_faces,set_name2,num_faces (etc). as a temporary work around for llGetLinkNumberOfSides()'s current inability to gather the number of faces from a mesh object properly (It always returns 8 regardless of the actual number of sides). This may be removed once it is fixed on OpenSim.
////////// CONSTANTS /////////////////////////////////////// ////////// CONSTANTS ///////////////////////////////////////
// Index offsets and stride size of data in "boxDataList". // Index offsets and stride size of data in "boxDataList".
@ -608,8 +601,7 @@ setDirty(integer action, integer first, integer last, integer isConf,
////////// STATES ////////////////////////////////////////// ////////// STATES //////////////////////////////////////////
default { default {
state_entry() state_entry() {
{
llOwnerSay("FURWARE text is starting..."); llOwnerSay("FURWARE text is starting...");
CHARS = llBase64ToString( CHARS = llBase64ToString(
@ -658,7 +650,7 @@ default {
(set1 << 20) | (set1 << 20) |
((llList2Integer(tokens, 2) & 0x3FF) << 10) | ((llList2Integer(tokens, 2) & 0x3FF) << 10) |
(llList2Integer(tokens, 3) & 0x3FF), (llList2Integer(tokens, 3) & 0x3FF),
linkMin llList2Integer(tokens, 4), linkMin
]; ];
++dataLength; ++dataLength;
} }
@ -673,7 +665,7 @@ default {
} }
// Sort the data according to their set1-row-col values. // Sort the data according to their set1-row-col values.
primLinkList = llListSort(primLinkList, 2, TRUE); primLinkList = llListSort(primLinkList, 3, TRUE);
// Parse the gathered data. // Parse the gathered data.
integer dataIndex; integer dataIndex;
@ -699,28 +691,9 @@ default {
do { // Col do { // Col
++newColCount; ++newColCount;
integer link = llList2Integer(primLinkList, 2*dataIndex+1); integer link = llList2Integer(primLinkList, 3*dataIndex+2);
integer newFaceCount = llGetLinkNumberOfSides(link); integer newFaceCount = llList2Integer(primLinkList, 3*dataIndex+1);
if (!newFaceCount) newFaceCount = llGetLinkNumberOfSides(link);
//OpenSim Workaround ---------------------------------------------------------
// This can be removed once OS fixes proper face count for mesh objects
if(giOpenSim)
{
list facesDesc = llCSV2List(llGetObjectDesc());
string thisSet = llList2String(sets, set2);
integer find = llListFindList(facesDesc, [thisSet]);
if(find != -1) newFaceCount = (integer)llList2String(facesDesc, find + 1);
else
{
llOwnerSay("I am missing a face configuration for the set '" + thisSet + "'");
setCount = 0;
return;
}
}
//-----------------------------------------------------------------------------
if (faceCount) { if (faceCount) {
if (newFaceCount != faceCount) { if (newFaceCount != faceCount) {
@ -737,7 +710,7 @@ default {
<1.0, 1.0, 0.0>, ZERO_VECTOR, 0.0 <1.0, 1.0, 0.0>, ZERO_VECTOR, 0.0
]); ]);
setrowcol = llList2Integer(primLinkList, 2*(++dataIndex)); setrowcol = llList2Integer(primLinkList, 3*(++dataIndex));
nextSet = (setrowcol >> 20) & 0x3FF; nextSet = (setrowcol >> 20) & 0x3FF;
nextRow = (setrowcol >> 10) & 0x3FF; nextRow = (setrowcol >> 10) & 0x3FF;
@ -768,8 +741,8 @@ default {
} while (dataIndex < dataLength); } while (dataIndex < dataLength);
primLinkList = llDeleteSubList(primLinkList, 0, 0); primLinkList = llDeleteSubList(primLinkList, 0, 1);
primLinkList = llList2ListStrided(primLinkList, 0, -1, 2); primLinkList = llList2ListStrided(primLinkList, 0, -1, 3);
while (dataIndex--) primFillList += [0]; while (dataIndex--) primFillList += [0];
primLayerList = primFillList; primLayerList = primFillList;