Skip to content

Commit 4b50143

Browse files
author
Pär Winzell
authored
License -> BSD (facebookincubator#186)
Relicense FBX2glTF as BSD.
1 parent 7fc7120 commit 4b50143

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+154
-276
lines changed

‎CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ set(CMAKE_CXX_STANDARD 11)
1717
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
1818
include(ExternalProject)
1919

20-
if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan_paths.cmake")
21-
message(FATAL_ERROR
22-
"The Conan package manager must run ('install') first. ${typical_usage_str}")
23-
endif()
24-
include("${CMAKE_BINARY_DIR}/conan_paths.cmake")
25-
2620
# FBX
2721
foreach (FBXSDK_VERSION "2019.2")
2822
find_package(FBX)
@@ -39,6 +33,12 @@ if (NOT FBXSDK_FOUND)
3933
)
4034
endif()
4135

36+
if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan_paths.cmake")
37+
message(FATAL_ERROR
38+
"The Conan package manager must run ('install') first. ${typical_usage_str}")
39+
endif()
40+
include("${CMAKE_BINARY_DIR}/conan_paths.cmake")
41+
4242
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
4343
find_package(Threads REQUIRED)
4444
find_package(Iconv QUIET)

‎FindFBX.cmake

+9-14
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,23 @@ else()
2424
endif()
2525

2626
if (NOT DEFINED FBXSDK_VERSION)
27-
set(FBXSDK_VERSION "2018.1.1")
27+
set(FBXSDK_VERSION "2019.2")
2828
endif()
2929

3030
set(_fbxsdk_vstudio_version "vs2017")
3131

3232
message("Looking for FBX SDK version: ${FBXSDK_VERSION}")
3333

34-
if (DEFINED FBXSDK_SDKS)
35-
get_filename_component(FBXSDK_SDKS_ABS ${FBXSDK_SDKS} ABSOLUTE)
36-
37-
set(FBXSDK_APPLE_ROOT "${FBXSDK_SDKS_ABS}/Darwin/${FBXSDK_VERSION}")
38-
set(FBXSDK_LINUX_ROOT "${FBXSDK_SDKS_ABS}/Linux/${FBXSDK_VERSION}")
39-
set(FBXSDK_WINDOWS_ROOT "${FBXSDK_SDKS_ABS}/Windows/${FBXSDK_VERSION}")
40-
else()
41-
set(FBXSDK_APPLE_ROOT
42-
"/Applications/Autodesk/FBX SDK/${FBXSDK_VERSION}")
43-
set(FBXSDK_LINUX_ROOT
44-
"/usr")
45-
set(FBXSDK_WINDOWS_ROOT
46-
"C:/Program Files/Autodesk/FBX/FBX SDK/${FBXSDK_VERSION}")
34+
if (NOT DEFINED FBXSDK_SDKS)
35+
set(FBXSDK_SDKS "${CMAKE_CURRENT_SOURCE_DIR}/sdk")
4736
endif()
4837

38+
get_filename_component(FBXSDK_SDKS_ABS ${FBXSDK_SDKS} ABSOLUTE)
39+
40+
set(FBXSDK_APPLE_ROOT "${FBXSDK_SDKS_ABS}/Darwin/${FBXSDK_VERSION}")
41+
set(FBXSDK_LINUX_ROOT "${FBXSDK_SDKS_ABS}/Linux/${FBXSDK_VERSION}")
42+
set(FBXSDK_WINDOWS_ROOT "${FBXSDK_SDKS_ABS}/Windows/${FBXSDK_VERSION}")
43+
4944
if (APPLE)
5045
set(_fbxsdk_root "${FBXSDK_APPLE_ROOT}")
5146
set(_fbxsdk_libdir_debug "lib/clang/debug")

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ BSD License
22

33
For FBX2glTF software
44

5-
Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
5+
Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.
66

77
Redistribution and use in source and binary forms, with or without modification,
88
are permitted provided that the following conditions are met:

‎PATENTS

-33
This file was deleted.

‎README.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# FBX2glTF
22

3+
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
4+
5+
36
This is a command line tool for converting 3D model assets on Autodesk's
47
venerable [FBX](https://www.autodesk.com/products/fbx/overview) format to
58
[glTF 2.0](https://github.com/KhronosGroup/glTF/tree/master/specification/2.0),
@@ -288,4 +291,4 @@ TODO items can be found
288291
- Amanda Watson
289292

290293
## License
291-
FBX2glTF is BSD-licensed. We also provide an additional patent grant.
294+
FBX2glTF is licensed under the [3-clause BSD license](LICENSE).

‎npm/fbx2gltf/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ BSD License
22

33
For FBX2glTF software
44

5-
Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
5+
Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.
66

77
Redistribution and use in source and binary forms, with or without modification,
88
are permitted provided that the following conditions are met:

‎npm/fbx2gltf/PATENTS

-33
This file was deleted.

‎npm/fbx2gltf/README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# FBX2glTF
22

3+
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
4+
5+
36
This is a command line tool for converting 3D model assets on the
47
well-established [FBX](https://www.autodesk.com/products/fbx/overview) format to
58
[glTF 2.0](https://github.com/KhronosGroup/glTF/tree/master/specification/2.0),
@@ -53,6 +56,9 @@ The home of this tool is [here](https://github.com/facebookincubator/FBX2glTF).
5356
5457
# Legal
5558
59+
FBX2glTF is licensed under the [3-clause BSD license](LICENSE).
60+
61+
```
5662
This software contains Autodesk® FBX® code developed by Autodesk, Inc. Copyright
5763
2017 Autodesk, Inc. All rights, reserved. Such code is provided “as is” and
5864
Autodesk, Inc. disclaims any and all warranties, whether express or implied,
@@ -64,4 +70,4 @@ of substitute goods or services; loss of use, data, or profits; or business
6470
interruption) however caused and on any theory of liability, whether in
6571
contract, strict liability, or tort (including negligence or otherwise) arising
6672
in any way out of such code.
67-
73+
```

‎npm/fbx2gltf/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919
"homepage": "https://github.com/facebookincubator/FBX2glTF",
2020
"files": [
2121
"LICENSE",
22-
"PATENTS",
2322
"README.md",
2423
"bin",
2524
"index.js"
2625
],
2726
"dependencies": {
2827
"rimraf": "^2.6.2"
2928
}
30-
}
29+
}

‎npm/tests/test/fbx2gltf.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98

109
import {assert, expect} from 'chai';

‎npm/tests/test/mocha.opts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
# Copyright (c) 2014-present, Facebook, Inc.
1+
# Copyright (c) Facebook, Inc. and its affiliates.
22
# All rights reserved.
33
#
44
# This source code is licensed under the BSD-style license found in the
5-
# LICENSE file in the root directory of this source tree. An additional grant
6-
# of patent rights can be found in the PATENTS file in the same directory.
5+
# LICENSE file in the root directory of this source tree.
76

87
--ui mocha-typescript
98
--require source-map-support/register

‎src/FBX2glTF.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98

109
#include <fstream>

‎src/FBX2glTF.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98

109
#pragma once

‎src/fbx/Fbx2Raw.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98

109
#include "Fbx2Raw.hpp"

‎src/fbx/Fbx2Raw.hpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98

109
#pragma once

‎src/fbx/FbxBlendShapesAccess.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98

109
#include "FbxBlendShapesAccess.hpp"

‎src/fbx/FbxBlendShapesAccess.hpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98

109
#pragma once

‎src/fbx/FbxLayerElementAccess.hpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98
#pragma once
109
#include "FBX2glTF.h"

‎src/fbx/FbxSkinningAccess.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98

109
#include "FbxSkinningAccess.hpp"
@@ -75,7 +74,9 @@ FbxSkinningAccess::FbxSkinningAccess(const FbxMesh* pMesh, FbxScene* pScene, Fbx
7574
}
7675
}
7776
for (int i = 0; i < controlPointCount; i++) {
78-
const float weightSumRcp = 1.0 / (vertexJointWeights[i][0] + vertexJointWeights[i][1] + vertexJointWeights[i][2] + vertexJointWeights[i][3]);
77+
const float weightSumRcp = 1.0 /
78+
(vertexJointWeights[i][0] + vertexJointWeights[i][1] + vertexJointWeights[i][2] +
79+
vertexJointWeights[i][3]);
7980
vertexJointWeights[i] *= weightSumRcp;
8081
}
8182
}

‎src/fbx/FbxSkinningAccess.hpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98

109
#pragma once

‎src/fbx/materials/3dsMaxPhysicalMaterial.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98

109
#include "RoughnessMetallicMaterials.hpp"

‎src/fbx/materials/FbxMaterials.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98

109
#include "fbx/Fbx2Raw.hpp"

‎src/fbx/materials/FbxMaterials.hpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
/**
2-
* Copyright (c) 2014-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
* All rights reserved.
44
*
55
* This source code is licensed under the BSD-style license found in the
6-
* LICENSE file in the root directory of this source tree. An additional grant
7-
* of patent rights can be found in the PATENTS file in the same directory.
6+
* LICENSE file in the root directory of this source tree.
87
*/
98

109
#pragma once

0 commit comments

Comments
 (0)