archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

merge from master

Browse Source
This commit is contained in:
Gaia Clary
2018-02-26 22:49:30 +01:00
parent e94276d403 7dd0e36dc4
commit f228a08d02
29 changed files with 522 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
source/blender/collada/collada_utils.cpp
View File

@@ -32,6 +32,8 @@
#include "COLLADAFWMeshPrimitive.h"
#include "COLLADAFWMeshVertexData.h"
#include <set>
extern "C" {
#include "DNA_modifier_types.h"
#include "DNA_customdata_types.h"
@@ -152,6 +154,15 @@ EvaluationContext *bc_get_evaluation_context()
return bmain->eval_ctx;
}
void bc_update_scene(EvaluationContext *eval_ctx, Scene *scene, float ctime)
{
BKE_scene_frame_set(scene, ctime);
Main *bmain = bc_get_main();
EvaluationContext *ev_context = bc_get_evaluation_context();
BKE_scene_graph_update_for_newframe(eval_ctx, eval_ctx->depsgraph, bmain, scene, eval_ctx->view_layer);
}
Object *bc_add_object(Scene *scene, ViewLayer *view_layer, int type, const char *name)
{
Object *ob = BKE_object_add_only_object(G.main, type, name);
@@ -895,3 +906,181 @@ void bc_sanitize_mat(double mat[4][4], int precision)
mat[i][j] = double_round(mat[i][j], precision);
}
void bc_copy_m4_farray(float r[4][4], float *a)
{
for (int i = 0; i < 4; i++)
for (int j = 0; j < 4; j++)
r[i][j] = *a++;
}
void bc_copy_farray_m4(float *r, float a[4][4])
{
for (int i = 0; i < 4; i++)
for (int j = 0; j < 4; j++)
*r++ = a[i][j];
}
/*
* Returns name of Active UV Layer or empty String if no active UV Layer defined
*/
std::string bc_get_active_uvlayer_name(Mesh *me)
{
int num_layers = CustomData_number_of_layers(&me->fdata, CD_MTFACE);
if (num_layers) {
char *layer_name = bc_CustomData_get_active_layer_name(&me->fdata, CD_MTFACE);
if (layer_name) {
return std::string(layer_name);
}
}
return "";
}
/*
* Returns name of Active UV Layer or empty String if no active UV Layer defined.
* Assuming the Object is of type MESH
*/
std::string bc_get_active_uvlayer_name(Object *ob)
{
Mesh *me = (Mesh *)ob->data;
return bc_get_active_uvlayer_name(me);
}
/*
* Returns UV Layer name or empty string if layer index is out of range
*/
std::string bc_get_uvlayer_name(Mesh *me, int layer)
{
int num_layers = CustomData_number_of_layers(&me->fdata, CD_MTFACE);
if (num_layers && layer < num_layers) {
char *layer_name = bc_CustomData_get_layer_name(&me->fdata, CD_MTFACE, layer);
if (layer_name) {
return std::string(layer_name);
}
}
return "";
}
#if 0
/**********************************************************************
*
* Return the list of Mesh objects with assigned UVtextures and Images
* Note: We need to create artificaial materials for each of them
*
***********************************************************************/
std::set<Object *> bc_getUVTexturedObjects(Scene *sce, bool all_uv_layers)
{
std::set <Object *> UVObjects;
Base *base = (Base *)sce->base.first;
while (base) {
Object *ob = base->object;
bool has_uvimage = false;
if (ob->type == OB_MESH) {
Mesh *me = (Mesh *)ob->data;
int active_uv_layer = CustomData_get_active_layer_index(&me->pdata, CD_MTEXPOLY);
for (int i = 0; i < me->pdata.totlayer && !has_uvimage; i++) {
if (all_uv_layers || active_uv_layer == i)
{
if (me->pdata.layers[i].type == CD_MTEXPOLY) {
MTexPoly *txface = (MTexPoly *)me->pdata.layers[i].data;
MPoly *mpoly = me->mpoly;
for (int j = 0; j < me->totpoly; j++, mpoly++, txface++) {
Image *ima = txface->tpage;
if (ima != NULL) {
has_uvimage = true;
break;
}
}
}
}
}
if (has_uvimage) {
UVObjects.insert(ob);
}
}
base = base->next;
}
return UVObjects;
}
/**********************************************************************
*
* Return the list of UV Texture images from all exported Mesh Items
* Note: We need to create one artificial material for each Image.
*
***********************************************************************/
std::set<Image *> bc_getUVImages(Scene *sce, bool all_uv_layers)
{
std::set <Image *> UVImages;
Base *base = (Base *)sce->base.first;
while (base) {
Object *ob = base->object;
bool has_uvimage = false;
if (ob->type == OB_MESH) {
Mesh *me = (Mesh *)ob->data;
int active_uv_layer = CustomData_get_active_layer_index(&me->pdata, CD_MTEXPOLY);
for (int i = 0; i < me->pdata.totlayer && !has_uvimage; i++) {
if (all_uv_layers || active_uv_layer == i)
{
if (me->pdata.layers[i].type == CD_MTEXPOLY) {
MTexPoly *txface = (MTexPoly *)me->pdata.layers[i].data;
MPoly *mpoly = me->mpoly;
for (int j = 0; j < me->totpoly; j++, mpoly++, txface++) {
Image *ima = txface->tpage;
if (ima != NULL) {
if (UVImages.find(ima) == UVImages.end())
UVImages.insert(ima);
}
}
}
}
}
}
base = base->next;
}
return UVImages;
}
/**********************************************************************
*
* Return the list of UV Texture images for the given Object
* Note: We need to create one artificial material for each Image.
*
***********************************************************************/
std::set<Image *> bc_getUVImages(Object *ob, bool all_uv_layers)
{
std::set <Image *> UVImages;
bool has_uvimage = false;
if (ob->type == OB_MESH) {
Mesh *me = (Mesh *)ob->data;
int active_uv_layer = CustomData_get_active_layer_index(&me->pdata, CD_MTEXPOLY);
for (int i = 0; i < me->pdata.totlayer && !has_uvimage; i++) {
if (all_uv_layers || active_uv_layer == i)
{
if (me->pdata.layers[i].type == CD_MTEXPOLY) {
MTexPoly *txface = (MTexPoly *)me->pdata.layers[i].data;
MPoly *mpoly = me->mpoly;
for (int j = 0; j < me->totpoly; j++, mpoly++, txface++) {
Image *ima = txface->tpage;
if (ima != NULL) {
if (UVImages.find(ima) == UVImages.end())
UVImages.insert(ima);
}
}
}
}
}
}
return UVImages;
}
#endif