Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed license to be V3 compatible

Browse Source 
Fixed count when stride is > 1
This commit is contained in:
Latif Khalifa
2013-07-31 21:53:29 +02:00
parent e4b446217c
commit 94947ac58d
2 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
indra/newview/daeexport.cpp
View File

@@ -1,26 +1,26 @@
/** /**
* @file daeexport.cpp * @file daeexport.cpp
* @brief A system which allows saving in-world objects to Collada .DAE files for offline texturizing/shading. * @brief A system which allows saving in-world objects to Collada .DAE files for offline texturizing/shading.
* @authors Latif Khalifa * @authors Latif Khalifa
* *
* $LicenseInfo:firstyear=2011&license=LGPLV3$ * $LicenseInfo:firstyear=2013&license=LGPLV2.1$
* Copyright (C) 2013 Latif Khalifa * Copyright (C) 2013 Latif Khalifa
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version. * version 2.1 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General * You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, write to the * Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA */ * Boston, MA 02110-1301 USA
*/
#include "llviewerprecompiledheaders.h" #include "llviewerprecompiledheaders.h"
#include "daeexport.h" #include "daeexport.h"
@@ -211,7 +211,7 @@ void DAESaver::addSource(daeElement* mesh, const char* src_id, std::string param
domAccessor* acc = daeSafeCast<domAccessor>(source->add("technique_common accessor")); domAccessor* acc = daeSafeCast<domAccessor>(source->add("technique_common accessor"));
acc->setSource(llformat("#%s-%s", src_id, "array").c_str()); acc->setSource(llformat("#%s-%s", src_id, "array").c_str());
acc->setCount(vals.size()); acc->setCount(vals.size() / params.size());
acc->setStride(params.size()); acc->setStride(params.size());
for (std::string::iterator p_iter = params.begin(); p_iter != params.end(); ++p_iter) for (std::string::iterator p_iter = params.begin(); p_iter != params.end(); ++p_iter)

43
indra/newview/daeexport.h
View File

@@ -1,25 +1,26 @@
/** /**
* @file daeexport.h * @file daeexport.h
* @brief A system which allows saving in-world objects to Collada .DAE files for offline texturizing/shading. * @brief A system which allows saving in-world objects to Collada .DAE files for offline texturizing/shading.
* @authors Latif Khalifa * @authors Latif Khalifa
* *
* $LicenseInfo:firstyear=2011&license=LGPLV3$ * $LicenseInfo:firstyear=2013&license=LGPLV2.1$
* Copyright (C) 2013 Latif Khalifa * Copyright (C) 2013 Latif Khalifa
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version. * version 2.1 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General * You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, write to the * Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA */ * Boston, MA 02110-1301 USA
*/
#ifndef DAEEXPORT_H_ #ifndef DAEEXPORT_H_
#define DAEEXPORT_H_ #define DAEEXPORT_H_