Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source/blender/blenkernel/intern/ipo.c17
-rw-r--r--source/blender/blenloader/intern/readfile.c2
-rw-r--r--source/blender/include/BSE_editipo_types.h217
-rw-r--r--source/blender/include/ipo.h269
-rw-r--r--source/blender/makesdna/DNA_ipo_types.h10
-rw-r--r--source/blender/src/drawipo.c2
-rw-r--r--source/blender/src/editipo.c13
-rw-r--r--source/blender/src/editkey.c1
-rw-r--r--source/blender/src/header_ipo.c2
-rw-r--r--source/blender/src/headerbuttons.c1
10 files changed, 35 insertions, 499 deletions
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 6de1ee876de..5487a2ad516 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -105,13 +105,13 @@ int ma_ar[MA_TOTIPO]= {
MA_SPEC_R, MA_SPEC_G, MA_SPEC_B,
MA_MIR_R, MA_MIR_G, MA_MIR_B,
MA_REF, MA_ALPHA, MA_EMIT, MA_AMB,
- MA_SPEC, MA_HARD, MA_SPTR, MA_ANG,
- MA_MODE, MA_HASIZE,
+ MA_SPEC, MA_HARD, MA_SPTR, MA_IOR,
+ MA_MODE, MA_HASIZE, MA_TRANSLU, MA_RAYM,
MA_MAP1+MAP_OFS_X, MA_MAP1+MAP_OFS_Y, MA_MAP1+MAP_OFS_Z,
MA_MAP1+MAP_SIZE_X, MA_MAP1+MAP_SIZE_Y, MA_MAP1+MAP_SIZE_Z,
MA_MAP1+MAP_R, MA_MAP1+MAP_G, MA_MAP1+MAP_B,
- MA_MAP1+MAP_DVAR, MA_MAP1+MAP_COLF, MA_MAP1+MAP_NORF, MA_MAP1+MAP_VARF
+ MA_MAP1+MAP_DVAR, MA_MAP1+MAP_COLF, MA_MAP1+MAP_NORF, MA_MAP1+MAP_VARF, MA_MAP1+MAP_DISP
};
int seq_ar[SEQ_TOTIPO]= {
@@ -890,6 +890,8 @@ void *give_mtex_poin(MTex *mtex, int adrcode )
poin= &(mtex->norfac); break;
case MAP_VARF:
poin= &(mtex->varfac); break;
+ case MAP_DISP:
+ poin= &(mtex->dispfac); break;
}
return poin;
@@ -1066,12 +1068,16 @@ void *get_ipo_poin(ID *id, IpoCurve *icu, int *type)
poin= &(ma->har); *type= IPO_SHORT; break;
case MA_SPTR:
poin= &(ma->spectra); break;
- case MA_ANG:
+ case MA_IOR:
poin= &(ma->ang); break;
case MA_MODE:
poin= &(ma->mode); *type= IPO_INT_BIT; break;
case MA_HASIZE:
poin= &(ma->hasize); break;
+ case MA_TRANSLU:
+ poin= &(ma->translucency); break;
+ case MA_RAYM:
+ poin= &(ma->ray_mirror); break;
}
if(poin==0) {
@@ -1292,6 +1298,7 @@ void set_icu_vars(IpoCurve *icu)
case MAP_DVAR:
case MAP_COLF:
case MAP_VARF:
+ case MAP_DISP:
icu->ymax= 1.0;
break;
case MAP_NORF:
@@ -1347,6 +1354,7 @@ void set_icu_vars(IpoCurve *icu)
case MAP_COLF:
case MAP_NORF:
case MAP_VARF:
+ case MAP_DISP:
icu->ymax= 1.0;
}
}
@@ -1389,6 +1397,7 @@ void set_icu_vars(IpoCurve *icu)
case MAP_COLF:
case MAP_NORF:
case MAP_VARF:
+ case MAP_DISP:
icu->ymax= 1.0;
}
}
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 361ac3666a0..2cb99493daf 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4116,7 +4116,7 @@ static void do_versions(Main *main)
ma->fresnel_mir= 0.0;
}
else if(ma->ang<1.0) { // temporal, because of IOR & fresnel change
- ma-> ang= 1.0/ma->ang;
+ ma->ang= 1.0/ma->ang;
ma->fresnel_tra= ma->ang;
ma->fresnel_mir= ma->ang;
}
diff --git a/source/blender/include/BSE_editipo_types.h b/source/blender/include/BSE_editipo_types.h
index c5cb40d9e1c..5076b36083a 100644
--- a/source/blender/include/BSE_editipo_types.h
+++ b/source/blender/include/BSE_editipo_types.h
@@ -35,8 +35,6 @@
struct BezTriple;
-// warn these structs are still in ipo.h!
-
typedef struct IpoKey {
struct IpoKey *next, *prev;
short flag, rt;
@@ -52,219 +50,4 @@ typedef struct EditIpo {
unsigned int col;
} EditIpo;
-
-#define IPOBUTY 17
-
-#define TOB_IPO 1
-#define TOB_IPODROT 2
-#define TOB_IKA 4
-
-/* disptype */
-#define IPO_DISPDEGR 1
-#define IPO_DISPBITS 2
-#define IPO_DISPTIME 3
-
-/* ******************** */
-
-#define OB_TOTIPO 29
-
-#define OB_LOC_X 1
-#define OB_LOC_Y 2
-#define OB_LOC_Z 3
-#define OB_DLOC_X 4
-#define OB_DLOC_Y 5
-#define OB_DLOC_Z 6
-
-#define OB_ROT_X 7
-#define OB_ROT_Y 8
-#define OB_ROT_Z 9
-#define OB_DROT_X 10
-#define OB_DROT_Y 11
-#define OB_DROT_Z 12
-
-#define OB_SIZE_X 13
-#define OB_SIZE_Y 14
-#define OB_SIZE_Z 15
-#define OB_DSIZE_X 16
-#define OB_DSIZE_Y 17
-#define OB_DSIZE_Z 18
-
-#define OB_LAY 19
-
-#define OB_TIME 20
-
-#define OB_EFF_X 21
-#define OB_EFF_Y 22
-#define OB_EFF_Z 23
-
-#define OB_COL_R 21
-#define OB_COL_G 22
-#define OB_COL_B 23
-#define OB_COL_A 24
-
-#define OB_PD_GRAV 25
-#define OB_PD_GFALL 26
-#define OB_PD_SDAMP 27
-#define OB_PD_RDAMP 28
-#define OB_PD_PERM 29
-
-
-/* ******************** */
-
-#define MA_TOTIPO 32
-
-#define MA_COL_R 1
-#define MA_COL_G 2
-#define MA_COL_B 3
-#define MA_SPEC_R 4
-#define MA_SPEC_G 5
-#define MA_SPEC_B 6
-#define MA_MIR_R 7
-#define MA_MIR_G 8
-#define MA_MIR_B 9
-#define MA_REF 10
-#define MA_ALPHA 11
-#define MA_EMIT 12
-#define MA_AMB 13
-#define MA_SPEC 14
-#define MA_HARD 15
-#define MA_SPTR 16
-#define MA_ANG 17
-#define MA_MODE 18
-#define MA_HASIZE 19
-
-#define MA_MAP1 0x20
-#define MA_MAP2 0x40
-#define MA_MAP3 0x80
-#define MA_MAP4 0x100
-#define MA_MAP5 0x200
-#define MA_MAP6 0x400
-#define MA_MAP7 0x800
-#define MA_MAP8 0x1000
-
-#define MAP_OFS_X 1
-#define MAP_OFS_Y 2
-#define MAP_OFS_Z 3
-#define MAP_SIZE_X 4
-#define MAP_SIZE_Y 5
-#define MAP_SIZE_Z 6
-#define MAP_R 7
-#define MAP_G 8
-#define MAP_B 9
-
-#define MAP_DVAR 10
-#define MAP_COLF 11
-#define MAP_NORF 12
-#define MAP_VARF 13
-
-/* ******************** */
-
-#define SEQ_TOTIPO 1
-
-#define SEQ_FAC1 1
-
-/* ******************** */
-
-#define CU_TOTIPO 1
-
-#define CU_SPEED 1
-
-/* ******************** */
-
-#define KEY_TOTIPO 32
-
-#define KEY_SPEED 0
-#define KEY_NR 1
-
-/* ******************** */
-
-#define WO_TOTIPO 29
-
-#define WO_HOR_R 1
-#define WO_HOR_G 2
-#define WO_HOR_B 3
-#define WO_ZEN_R 4
-#define WO_ZEN_G 5
-#define WO_ZEN_B 6
-
-#define WO_EXPOS 7
-
-#define WO_MISI 8
-#define WO_MISTDI 9
-#define WO_MISTSTA 10
-#define WO_MISTHI 11
-
-#define WO_STAR_R 12
-#define WO_STAR_G 13
-#define WO_STAR_B 14
-#define WO_STARDIST 15
-#define WO_STARSIZE 16
-
-/* ******************** */
-
-#define LA_TOTIPO 23
-
-#define LA_ENERGY 1
-#define LA_COL_R 2
-#define LA_COL_G 3
-#define LA_COL_B 4
-#define LA_DIST 5
-#define LA_SPOTSI 6
-#define LA_SPOTBL 7
-#define LA_QUAD1 8
-#define LA_QUAD2 9
-#define LA_HALOINT 10
-
-/* ******************** */
-
-#define CAM_TOTIPO 3
-
-#define CAM_LENS 1
-#define CAM_STA 2
-#define CAM_END 3
-
-
-/* ******************** */
-
-#define SND_TOTIPO 4
-
-#define SND_VOLUME 1
-#define SND_PITCH 2
-#define SND_PANNING 3
-#define SND_ATTEN 4
-
-/* ******************** */
-
-#define AC_TOTIPO 10 /* Action Ipos */
-
-#define AC_LOC_X 1
-#define AC_LOC_Y 2
-#define AC_LOC_Z 3
-
-#define AC_SIZE_X 13
-#define AC_SIZE_Y 14
-#define AC_SIZE_Z 15
-
-#define AC_QUAT_W 25
-#define AC_QUAT_X 26
-#define AC_QUAT_Y 27
-#define AC_QUAT_Z 28
-
-/* ******************** */
-
-#define CO_TOTIPO 1 /* Constraint Ipos */
-
-#define CO_ENFORCE 1
-/*
-#define CO_TIME 2
-#define CO_OFFSET_X 3
-#define CO_OFFSET_Y 4
-#define CO_OFFSET_Z 5
-#define CO_ORIENT_X 6
-#define CO_ORIENT_Y 7
-#define CO_ORIENT_Z 8
-#define CO_ROLL 9
-*/
-
#endif /* BSE_EDITIPO_TYPES_H */
-
diff --git a/source/blender/include/ipo.h b/source/blender/include/ipo.h
deleted file mode 100644
index 6ae9b68d0a3..00000000000
--- a/source/blender/include/ipo.h
+++ /dev/null
@@ -1,269 +0,0 @@
-
-/* ipo.h
- *
- * april 95
- *
- * $Id$
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License. See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef IPO_H
-#define IPO_H
-
-struct BezTriple;
-
-typedef struct IpoKey {
- struct IpoKey *next, *prev;
- short flag, rt;
- float val;
- struct BezTriple **data;
-} IpoKey;
-
-typedef struct EditIpo {
- char name[32];
- IpoCurve *icu;
- short adrcode, flag;
- short disptype, rt;
- unsigned int col;
-} EditIpo;
-
-
-#define IPOBUTY 17
-
-
-/* disptype */
-#define IPO_DISPDEGR 1
-#define IPO_DISPBITS 2
-#define IPO_DISPTIME 3
-
-/* ******************** */
-
-#define OB_TOTIPO 29
-
-#define OB_LOC_X 1
-#define OB_LOC_Y 2
-#define OB_LOC_Z 3
-#define OB_DLOC_X 4
-#define OB_DLOC_Y 5
-#define OB_DLOC_Z 6
-
-#define OB_ROT_X 7
-#define OB_ROT_Y 8
-#define OB_ROT_Z 9
-#define OB_DROT_X 10
-#define OB_DROT_Y 11
-#define OB_DROT_Z 12
-
-#define OB_SIZE_X 13
-#define OB_SIZE_Y 14
-#define OB_SIZE_Z 15
-#define OB_DSIZE_X 16
-#define OB_DSIZE_Y 17
-#define OB_DSIZE_Z 18
-
-#define OB_LAY 19
-
-#define OB_TIME 20
-
-#define OB_EFF_X 21
-#define OB_EFF_Y 22
-#define OB_EFF_Z 23
-
-#define OB_COL_R 21
-#define OB_COL_G 22
-#define OB_COL_B 23
-#define OB_COL_A 24
-
-#define OB_PD_GRAV 25
-#define OB_PD_GFALL 26
-#define OB_PD_SDAMP 27
-#define OB_PD_RDAMP 28
-#define OB_PD_PERM 29
-
-
-/* ******************** */
-
-#define MA_TOTIPO 32
-
-#define MA_COL_R 1
-#define MA_COL_G 2
-#define MA_COL_B 3
-#define MA_SPEC_R 4
-#define MA_SPEC_G 5
-#define MA_SPEC_B 6
-#define MA_MIR_R 7
-#define MA_MIR_G 8
-#define MA_MIR_B 9
-#define MA_REF 10
-#define MA_ALPHA 11
-#define MA_EMIT 12
-#define MA_AMB 13
-#define MA_SPEC 14
-#define MA_HARD 15
-#define MA_SPTR 16
-#define MA_ANG 17
-#define MA_MODE 18
-#define MA_HASIZE 19
-
-#define MA_MAP1 0x20
-#define MA_MAP2 0x40
-#define MA_MAP3 0x80
-#define MA_MAP4 0x100
-#define MA_MAP5 0x200
-#define MA_MAP6 0x400
-#define MA_MAP7 0x800
-#define MA_MAP8 0x1000
-
-#define MAP_OFS_X 1
-#define MAP_OFS_Y 2
-#define MAP_OFS_Z 3
-#define MAP_SIZE_X 4
-#define MAP_SIZE_Y 5
-#define MAP_SIZE_Z 6
-#define MAP_R 7
-#define MAP_G 8
-#define MAP_B 9
-
-#define MAP_DVAR 10
-#define MAP_COLF 11
-#define MAP_NORF 12
-#define MAP_VARF 13
-
-/* ******************** */
-
-#define SEQ_TOTIPO 1
-
-#define SEQ_FAC1 1
-
-/* ******************** */
-
-#define CU_TOTIPO 1
-
-#define CU_SPEED 1
-
-/* ******************** */
-
-#define KEY_TOTIPO 32
-
-#define KEY_SPEED 0
-#define KEY_NR 1
-
-/* ******************** */
-
-#define WO_TOTIPO 29
-
-#define WO_HOR_R 1
-#define WO_HOR_G 2
-#define WO_HOR_B 3
-#define WO_ZEN_R 4
-#define WO_ZEN_G 5
-#define WO_ZEN_B 6
-
-#define WO_EXPOS 7
-
-#define WO_MISI 8
-#define WO_MISTDI 9
-#define WO_MISTSTA 10
-#define WO_MISTHI 11
-
-#define WO_STAR_R 12
-#define WO_STAR_G 13
-#define WO_STAR_B 14
-#define WO_STARDIST 15
-#define WO_STARSIZE 16
-
-/* ******************** */
-
-#define LA_TOTIPO 23
-
-#define LA_ENERGY 1
-#define LA_COL_R 2
-#define LA_COL_G 3
-#define LA_COL_B 4
-#define LA_DIST 5
-#define LA_SPOTSI 6
-#define LA_SPOTBL 7
-#define LA_QUAD1 8
-#define LA_QUAD2 9
-#define LA_HALOINT 10
-
-/* ******************** */
-
-#define CAM_TOTIPO 3
-
-#define CAM_LENS 1
-#define CAM_STA 2
-#define CAM_END 3
-
-
-/* ******************** */
-
-#define SND_TOTIPO 4
-
-#define SND_VOLUME 1
-#define SND_PITCH 2
-#define SND_PANNING 3
-#define SND_ATTEN 4
-
-/* ******************** */
-
-#define AC_TOTIPO 10 /* Action Ipos */
-
-#define AC_LOC_X 1
-#define AC_LOC_Y 2
-#define AC_LOC_Z 3
-
-#define AC_SIZE_X 13
-#define AC_SIZE_Y 14
-#define AC_SIZE_Z 15
-
-#define AC_QUAT_W 25
-#define AC_QUAT_X 26
-#define AC_QUAT_Y 27
-#define AC_QUAT_Z 28
-
-/* ******************** */
-
-#define CO_TOTIPO 1 /* Constraint Ipos */
-
-#define CO_ENFORCE 1
-/*
-#define CO_TIME 2
-#define CO_OFFSET_X 3
-#define CO_OFFSET_Y 4
-#define CO_OFFSET_Z 5
-#define CO_ORIENT_X 6
-#define CO_ORIENT_Y 7
-#define CO_ORIENT_Z 8
-#define CO_ROLL 9
-*/
-
-#endif /* IPO_H */
-
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 0fc5ce64eaa..c9b3f2899f0 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -57,6 +57,9 @@ typedef short IPO_Channel;
#define IPOBUTY 17
+#define TOB_IPO 1
+#define TOB_IPODROT 2
+#define TOB_IKA 4
/* disptype */
#define IPO_DISPDEGR 1
@@ -111,7 +114,7 @@ typedef short IPO_Channel;
/* ******************** */
-#define MA_TOTIPO 32
+#define MA_TOTIPO 35
#define MA_COL_R 1
#define MA_COL_G 2
@@ -129,9 +132,11 @@ typedef short IPO_Channel;
#define MA_SPEC 14
#define MA_HARD 15
#define MA_SPTR 16
-#define MA_ANG 17
+#define MA_IOR 17
#define MA_MODE 18
#define MA_HASIZE 19
+#define MA_TRANSLU 20
+#define MA_RAYM 21
#define MA_MAP1 0x20
#define MA_MAP2 0x40
@@ -156,6 +161,7 @@ typedef short IPO_Channel;
#define MAP_COLF 11
#define MAP_NORF 12
#define MAP_VARF 13
+#define MAP_DISP 14
/* ******************** */
diff --git a/source/blender/src/drawipo.c b/source/blender/src/drawipo.c
index b075186fbaf..3b05e08e2f0 100644
--- a/source/blender/src/drawipo.c
+++ b/source/blender/src/drawipo.c
@@ -76,11 +76,11 @@
#include "BSE_drawipo.h"
#include "BSE_view.h"
#include "BSE_editipo.h"
+#include "BSE_editipo_types.h"
#include "BSE_editaction_types.h"
#include "BSE_editnla_types.h"
#include "mydevice.h"
-#include "ipo.h" /* retains old stuff */
#include "blendef.h"
#include "butspace.h" // shouldnt be...
diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c
index 1a2af081914..183a46e46ce 100644
--- a/source/blender/src/editipo.c
+++ b/source/blender/src/editipo.c
@@ -285,6 +285,8 @@ void getname_tex_ei(int nr, char *str)
strcpy(str, "Nor"); break;
case MAP_VARF:
strcpy(str, "Var"); break;
+ case MAP_DISP:
+ strcpy(str, "Disp"); break;
default:
str[0]= 0;
}
@@ -327,12 +329,16 @@ void getname_mat_ei(int nr, char *str)
strcpy(str, "Hard"); break;
case MA_SPTR:
strcpy(str, "SpTra"); break;
- case MA_ANG:
- strcpy(str, "Ang"); break;
+ case MA_IOR:
+ strcpy(str, "Ior"); break;
case MA_MODE:
strcpy(str, "Mode"); break;
case MA_HASIZE:
strcpy(str, "HaSize"); break;
+ case MA_TRANSLU:
+ strcpy(str, "Translu"); break;
+ case MA_RAYM:
+ strcpy(str, "RayMir"); break;
default:
str[0]= 0;
}
@@ -3708,6 +3714,8 @@ void common_insertkey()
insertkey(id, MA_SPEC);
insertkey(id, MA_HARD);
insertkey(id, MA_MODE);
+ insertkey(id, MA_TRANSLU);
+ insertkey(id, MA_RAYM);
}
if(event==12 || event==11) {
insertkey(id, map+MAP_OFS_X);
@@ -3727,6 +3735,7 @@ void common_insertkey()
insertkey(id, map+MAP_COLF);
insertkey(id, map+MAP_NORF);
insertkey(id, map+MAP_VARF);
+ insertkey(id, map+MAP_DISP);
}
}
}
diff --git a/source/blender/src/editkey.c b/source/blender/src/editkey.c
index cffe98cde4e..4a13bd10cc9 100644
--- a/source/blender/src/editkey.c
+++ b/source/blender/src/editkey.c
@@ -86,7 +86,6 @@
#include "blendef.h"
#include "mydevice.h"
-#include "ipo.h"
extern ListBase editNurb; /* in editcurve.c */
diff --git a/source/blender/src/header_ipo.c b/source/blender/src/header_ipo.c
index 3c34cde2764..a51bae9d557 100644
--- a/source/blender/src/header_ipo.c
+++ b/source/blender/src/header_ipo.c
@@ -74,11 +74,11 @@
#include "BKE_utildefines.h"
#include "BLI_blenlib.h"
#include "BSE_drawipo.h"
+#include "BSE_editipo_types.h"
#include "BSE_edit.h"
#include "BSE_editipo.h"
#include "BSE_headerbuttons.h"
-#include "ipo.h"
#include "nla.h"
#include "blendef.h"
diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c
index ed1e9f30cdb..fb933c41d22 100644
--- a/source/blender/src/headerbuttons.c
+++ b/source/blender/src/headerbuttons.c
@@ -174,7 +174,6 @@
#include "mydevice.h"
#include "blendef.h"
#include "render.h"
-#include "ipo.h"
#include "nla.h" /* __NLA : To be removed later */
#include "butspace.h" // test_idbutton
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 20:43:31 +0300